126400 2014-01-02 14:04:41 -0800 "+" is very confusing at http://build.webkit.org/dashboard 2014-01-02 15:20:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap bshafiei commit-queue mitz rniwa thorton timothy oldest_to_newest 963873 0 ap 2014-01-02 14:04:41 -0800 Getting lots of negative feedback about this one. 963882 1 220250 ap 2014-01-02 14:20:45 -0800 Created attachment 220250 proposed patch 963883 2 commit-queue 2014-01-02 14:21:42 -0800 Attachment 220250 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js', u'Tools/ChangeLog', '--commit-queue']" exit_code: 1 ERROR: Tools/ChangeLog:3: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 963894 3 220253 ap 2014-01-02 14:35:09 -0800 Created attachment 220253 proposed patch Indeed. 963897 4 220254 ap 2014-01-02 14:37:03 -0800 Created attachment 220254 proposed patch Oops. Third time a charm? 963904 5 220254 ap 2014-01-02 14:50:39 -0800 Comment on attachment 220254 proposed patch Let's see how well this works for everyone. 963918 6 220254 commit-queue 2014-01-02 15:20:48 -0800 Comment on attachment 220254 proposed patch Clearing flags on attachment: 220254 Committed r161233: <http://trac.webkit.org/changeset/161233> 963919 7 commit-queue 2014-01-02 15:20:50 -0800 All reviewed patches have been landed. Closing bug. 220250 2014-01-02 14:20:45 -0800 2014-01-02 14:35:09 -0800 proposed patch NoPlus.txt text/plain 3381 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTIyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE0LTAxLTAyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgICIrIiBpcyB2ZXJ5IGNvbmZ1c2luZyBhdCBodHRwOi8vYnVpbGQud2Via2l0 Lm9yZy9kYXNoYm9hcmQKKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6CisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90 b3R5cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTogSW5zdGVhZCBvZiBsaXN0aW5nIG9w ZW4KKyAgICAgICAgc291cmNlIGFuZCBpbnRlcm5hbCBjb3VudHMgc2VwYXJhdGVseSwgc2ltcGx5 IGFkZCB0aGVtLiBPbmUgY2FuIGFsd2F5cyBvcGVuIGEgcG9wb3ZlcgorICAgICAgICBmb3IgbW9y ZSBkZXRhaWwuCisKIDIwMTQtMDEtMDIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5j b20+CiAKICAgICAgICAgQWNjZXNzaW5nIFRyYWMgZnJvbSBidWlsZC53ZWJraXQub3JnL2Rhc2hi b2FyZCBzaG91bGQgZW5hYmxlIFhNTEh0dHBSZXF1ZXN0LndpdGhDcmVkZW50aWFscwpJbmRleDog VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMJKHJldmlzaW9uIDE2MTIw OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCSh3b3JraW5n IGNvcHkpCkBAIC03OSw5ICs3OSw5IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKCFsYXRlc3RSZWNvcmRlZE9wZW5Tb3VyY2VSZXZpc2lvbk51bWJlcikKICAg ICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgb3BlblNvdXJjZVJldmlzaW9uc0JlaGlu ZCA9IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyIC0gbGF0ZXN0UHJvZHVj dGl2ZUl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb247Ci0gICAgICAgIGlmIChvcGVuU291cmNl UmV2aXNpb25zQmVoaW5kIDwgMCkKLSAgICAgICAgICAgIG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhp bmQgPSAwOworICAgICAgICB2YXIgdG90YWxSZXZpc2lvbnNCZWhpbmQgPSBsYXRlc3RSZWNvcmRl ZE9wZW5Tb3VyY2VSZXZpc2lvbk51bWJlciAtIGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ub3Bl blNvdXJjZVJldmlzaW9uOworICAgICAgICBpZiAodG90YWxSZXZpc2lvbnNCZWhpbmQgPCAwKQor ICAgICAgICAgICAgdG90YWxSZXZpc2lvbnNCZWhpbmQgPSAwOwogCiAgICAgICAgIGlmIChsYXRl c3RQcm9kdWN0aXZlSXRlcmF0aW9uLmludGVybmFsUmV2aXNpb24pIHsKICAgICAgICAgICAgIHZh ciBsYXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1iZXIgPSBpbnRlcm5hbFRyYWMubGF0 ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcjsKQEAgLTg5LDE4ICs4OSwxNSBAQCBCdWlsZGJvdFF1 ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg ICAgICB2YXIgaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgPSBsYXRlc3RSZWNvcmRlZEludGVybmFs UmV2aXNpb25OdW1iZXIgLSBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLmludGVybmFsUmV2aXNp b247Ci0gICAgICAgICAgICBpZiAoaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgPCAwKQotICAgICAg ICAgICAgICAgIGludGVybmFsUmV2aXNpb25zQmVoaW5kID0gMDsKLSAgICAgICAgICAgIGlmIChv cGVuU291cmNlUmV2aXNpb25zQmVoaW5kIHx8IGludGVybmFsUmV2aXNpb25zQmVoaW5kKQotICAg ICAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dCA9IG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQg KyAiIFx1ZmYwYiAiICsgaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgKyAiIHJldmlzaW9ucyBiZWhp bmQiOwotICAgICAgICB9IGVsc2UgaWYgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQpCi0gICAg ICAgICAgICB2YXIgbWVzc2FnZVRleHQgPSBvcGVuU291cmNlUmV2aXNpb25zQmVoaW5kICsgIiAi ICsgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgPT09IDEgPyAicmV2aXNpb24gYmVoaW5kIiA6 ICJyZXZpc2lvbnMgYmVoaW5kIik7CisgICAgICAgICAgICBpZiAoaW50ZXJuYWxSZXZpc2lvbnNC ZWhpbmQgPiAwKQorICAgICAgICAgICAgICAgIHRvdGFsUmV2aXNpb25zQmVoaW5kICs9IGludGVy bmFsUmV2aXNpb25zQmVoaW5kOworICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFtZXNzYWdlVGV4 dCkKKyAgICAgICAgaWYgKCF0b3RhbFJldmlzaW9uc0JlaGluZCkKICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB2YXIgbWVzc2FnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7IC8vIFdlIGNhbid0IGp1c3QgcGFzcyB0ZXh0IHRvIFN0YXR1c0xpbmVWaWV3IGhl cmUsIGJlY2F1c2Ugd2UgbmVlZCBhbiBlbGVtZW50IHRoYXQgcGVyZmVjdGx5IGZpdHMgdGhlIHRl eHQgZm9yIHBvcG92ZXIgcG9zaXRpb25pbmcuCi0gICAgICAgIG1lc3NhZ2VFbGVtZW50LnRleHRD b250ZW50ID0gbWVzc2FnZVRleHQ7CisgICAgICAgIG1lc3NhZ2VFbGVtZW50LnRleHRDb250ZW50 ID0gdG90YWxSZXZpc2lvbnNCZWhpbmQgKyAiICIgKyAodG90YWxSZXZpc2lvbnNCZWhpbmQgPT09 IDEgPyAicmV2aXNpb24gYmVoaW5kIiA6ICJyZXZpc2lvbnMgYmVoaW5kIik7CiAgICAgICAgIHZh ciBzdGF0dXMgPSBuZXcgU3RhdHVzTGluZVZpZXcobWVzc2FnZUVsZW1lbnQsIFN0YXR1c0xpbmVW aWV3LlN0YXR1cy5Ob0J1YmJsZSk7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChz dGF0dXMuZWxlbWVudCk7CiAK 220253 2014-01-02 14:35:09 -0800 2014-01-02 14:37:03 -0800 proposed patch NoPlus.txt text/plain 4658 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTIyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDE0LTAxLTAyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEJpbmRpbmdzIHRlc3RzIHJlc3VsdHMgbGlua3MgYXJlIGJyb2tlbiBhdCBi dWlsZC53ZWJraXQub3JnL2Rhc2hib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qczoKKyAgICAgICAg KEJ1aWxkYm90LnByb3RvdHlwZS5iaW5kaW5nc1Rlc3RSZXN1bHRzVVJMRm9ySXRlcmF0aW9uKTog Rml4ZWQgYSB0eXBvIHRoYXQgd2FzIHRoZXJlCisgICAgICAgIHNpbmNlIHRoZSBiZWdpbm5pbmcu CisKKzIwMTQtMDEtMDIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAg ICAgICAgIisiIGlzIHZlcnkgY29uZnVzaW5nIGF0IGh0dHA6Ly9idWlsZC53ZWJraXQub3JnL2Rh c2hib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI2NDAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAgICAgKEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZS5fYXBwZW5kUGVuZGluZ1JldmlzaW9uQ291bnQpOiBJbnN0ZWFk IG9mIGxpc3Rpbmcgb3BlbgorICAgICAgICBzb3VyY2UgYW5kIGludGVybmFsIGNvdW50cyBzZXBh cmF0ZWx5LCBzaW1wbHkgYWRkIHRoZW0uIE9uZSBjYW4gYWx3YXlzIG9wZW4gYSBwb3BvdmVyCisg ICAgICAgIGZvciBtb3JlIGRldGFpbC4KKwogMjAxNC0wMS0wMiAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBCaW5kaW5ncyB0ZXN0cyByZXN1bHRzIGxpbmtz IGFyZSBicm9rZW4gYXQgYnVpbGQud2Via2l0Lm9yZy9kYXNoYm9hcmQKSW5kZXg6IFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0J1aWxkYm90LmpzCShyZXZpc2lvbiAxNjEyMDkpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9CdWlsZGJvdC5qcwkod29ya2luZyBjb3B5KQpAQCAtODMsNiArODMsNiBAQCBCdWlsZGJvdC5w cm90b3R5cGUgPSB7CiAKICAgICBiaW5kaW5nc1Rlc3RSZXN1bHRzVVJMRm9ySXRlcmF0aW9uOiBm dW5jdGlvbihpdGVyYXRpb24pCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5iYXNlVVJMICsg ImJ1aWxkZXJzLyIgKyBlbmNvZGVVUklDb21wb25lbnQoaXRlcmF0aW9uLnF1ZXVlLmlkKSArICIv YnVpbGRzLyIgKyBpdGVyYXRpb24uaWQgKyAiL3N0ZXBzL2JpbmRpbmdzLWdlbmVyYXRpb24tdGVz dC9sb2dzL3N0ZGlvIjsKKyAgICAgICAgcmV0dXJuIHRoaXMuYmFzZVVSTCArICJidWlsZGVycy8i ICsgZW5jb2RlVVJJQ29tcG9uZW50KGl0ZXJhdGlvbi5xdWV1ZS5pZCkgKyAiL2J1aWxkcy8iICsg aXRlcmF0aW9uLmlkICsgIi9zdGVwcy9iaW5kaW5ncy1nZW5lcmF0aW9uLXRlc3RzL2xvZ3Mvc3Rk aW8iOwogICAgIH0KIH07CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl Vmlldy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl Vmlldy5qcwkocmV2aXNpb24gMTYxMjA5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RRdWV1ZVZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTc5LDkgKzc5LDkgQEAgQnVpbGRib3RR dWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWxhdGVzdFJlY29yZGVkT3BlblNv dXJjZVJldmlzaW9uTnVtYmVyKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBv cGVuU291cmNlUmV2aXNpb25zQmVoaW5kID0gbGF0ZXN0UmVjb3JkZWRPcGVuU291cmNlUmV2aXNp b25OdW1iZXIgLSBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLm9wZW5Tb3VyY2VSZXZpc2lvbjsK LSAgICAgICAgaWYgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgPCAwKQotICAgICAgICAgICAg b3BlblNvdXJjZVJldmlzaW9uc0JlaGluZCA9IDA7CisgICAgICAgIHZhciB0b3RhbFJldmlzaW9u c0JlaGluZCA9IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9uTnVtYmVyIC0gbGF0ZXN0 UHJvZHVjdGl2ZUl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb247CisgICAgICAgIGlmICh0b3Rh bFJldmlzaW9uc0JlaGluZCA8IDApCisgICAgICAgICAgICB0b3RhbFJldmlzaW9uc0JlaGluZCA9 IDA7CiAKICAgICAgICAgaWYgKGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24uaW50ZXJuYWxSZXZp c2lvbikgewogICAgICAgICAgICAgdmFyIGxhdGVzdFJlY29yZGVkSW50ZXJuYWxSZXZpc2lvbk51 bWJlciA9IGludGVybmFsVHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyOwpAQCAtODks MTggKzg5LDE1IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgICAgIHZhciBpbnRlcm5hbFJldmlzaW9uc0JlaGluZCA9 IGxhdGVzdFJlY29yZGVkSW50ZXJuYWxSZXZpc2lvbk51bWJlciAtIGxhdGVzdFByb2R1Y3RpdmVJ dGVyYXRpb24uaW50ZXJuYWxSZXZpc2lvbjsKLSAgICAgICAgICAgIGlmIChpbnRlcm5hbFJldmlz aW9uc0JlaGluZCA8IDApCi0gICAgICAgICAgICAgICAgaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQg PSAwOwotICAgICAgICAgICAgaWYgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgfHwgaW50ZXJu YWxSZXZpc2lvbnNCZWhpbmQpCi0gICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2VUZXh0ID0gb3Bl blNvdXJjZVJldmlzaW9uc0JlaGluZCArICIgXHVmZjBiICIgKyBpbnRlcm5hbFJldmlzaW9uc0Jl aGluZCArICIgcmV2aXNpb25zIGJlaGluZCI7Ci0gICAgICAgIH0gZWxzZSBpZiAob3BlblNvdXJj ZVJldmlzaW9uc0JlaGluZCkKLSAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dCA9IG9wZW5Tb3Vy Y2VSZXZpc2lvbnNCZWhpbmQgKyAiICIgKyAob3BlblNvdXJjZVJldmlzaW9uc0JlaGluZCA9PT0g MSA/ICJyZXZpc2lvbiBiZWhpbmQiIDogInJldmlzaW9ucyBiZWhpbmQiKTsKKyAgICAgICAgICAg IGlmIChpbnRlcm5hbFJldmlzaW9uc0JlaGluZCA+IDApCisgICAgICAgICAgICAgICAgdG90YWxS ZXZpc2lvbnNCZWhpbmQgKz0gaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQ7CisgICAgICAgIH0KIAot ICAgICAgICBpZiAoIW1lc3NhZ2VUZXh0KQorICAgICAgICBpZiAoIXRvdGFsUmV2aXNpb25zQmVo aW5kKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBtZXNzYWdlRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsgLy8gV2UgY2FuJ3QganVzdCBwYXNzIHRl eHQgdG8gU3RhdHVzTGluZVZpZXcgaGVyZSwgYmVjYXVzZSB3ZSBuZWVkIGFuIGVsZW1lbnQgdGhh dCBwZXJmZWN0bHkgZml0cyB0aGUgdGV4dCBmb3IgcG9wb3ZlciBwb3NpdGlvbmluZy4KLSAgICAg ICAgbWVzc2FnZUVsZW1lbnQudGV4dENvbnRlbnQgPSBtZXNzYWdlVGV4dDsKKyAgICAgICAgbWVz c2FnZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0b3RhbFJldmlzaW9uc0JlaGluZCArICIgIiArICh0 b3RhbFJldmlzaW9uc0JlaGluZCA9PT0gMSA/ICJyZXZpc2lvbiBiZWhpbmQiIDogInJldmlzaW9u cyBiZWhpbmQiKTsKICAgICAgICAgdmFyIHN0YXR1cyA9IG5ldyBTdGF0dXNMaW5lVmlldyhtZXNz YWdlRWxlbWVudCwgU3RhdHVzTGluZVZpZXcuU3RhdHVzLk5vQnViYmxlKTsKICAgICAgICAgdGhp cy5lbGVtZW50LmFwcGVuZENoaWxkKHN0YXR1cy5lbGVtZW50KTsKIAo= 220254 2014-01-02 14:37:03 -0800 2014-01-02 15:20:48 -0800 proposed patch NoPlus.txt text/plain 3402 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTIyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE0LTAxLTAyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgICIrIiBpcyB2ZXJ5IGNvbmZ1c2luZyBhdCBodHRwOi8vYnVpbGQud2Via2l0 Lm9yZy9kYXNoYm9hcmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6CisgICAgICAgIChC dWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KTog SW5zdGVhZCBvZiBsaXN0aW5nIG9wZW4KKyAgICAgICAgc291cmNlIGFuZCBpbnRlcm5hbCBjb3Vu dHMgc2VwYXJhdGVseSwgc2ltcGx5IGFkZCB0aGVtLiBPbmUgY2FuIGFsd2F5cyBvcGVuIGEgcG9w b3ZlcgorICAgICAgICBmb3IgbW9yZSBkZXRhaWwuCisKIDIwMTQtMDEtMDIgIEFsZXhleSBQcm9z a3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQWNjZXNzaW5nIFRyYWMgZnJvbSBi dWlsZC53ZWJraXQub3JnL2Rhc2hib2FyZCBzaG91bGQgZW5hYmxlIFhNTEh0dHBSZXF1ZXN0Lndp dGhDcmVkZW50aWFscwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZp ZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZp ZXcuanMJKHJldmlzaW9uIDE2MTIwOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 UXVldWVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC03OSw5ICs3OSw5IEBAIEJ1aWxkYm90UXVl dWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFsYXRlc3RSZWNvcmRlZE9wZW5Tb3Vy Y2VSZXZpc2lvbk51bWJlcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgb3Bl blNvdXJjZVJldmlzaW9uc0JlaGluZCA9IGxhdGVzdFJlY29yZGVkT3BlblNvdXJjZVJldmlzaW9u TnVtYmVyIC0gbGF0ZXN0UHJvZHVjdGl2ZUl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb247Ci0g ICAgICAgIGlmIChvcGVuU291cmNlUmV2aXNpb25zQmVoaW5kIDwgMCkKLSAgICAgICAgICAgIG9w ZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgPSAwOworICAgICAgICB2YXIgdG90YWxSZXZpc2lvbnNC ZWhpbmQgPSBsYXRlc3RSZWNvcmRlZE9wZW5Tb3VyY2VSZXZpc2lvbk51bWJlciAtIGxhdGVzdFBy b2R1Y3RpdmVJdGVyYXRpb24ub3BlblNvdXJjZVJldmlzaW9uOworICAgICAgICBpZiAodG90YWxS ZXZpc2lvbnNCZWhpbmQgPCAwKQorICAgICAgICAgICAgdG90YWxSZXZpc2lvbnNCZWhpbmQgPSAw OwogCiAgICAgICAgIGlmIChsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLmludGVybmFsUmV2aXNp b24pIHsKICAgICAgICAgICAgIHZhciBsYXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1i ZXIgPSBpbnRlcm5hbFRyYWMubGF0ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcjsKQEAgLTg5LDE4 ICs4OSwxNSBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgICAgICB2YXIgaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgPSBs YXRlc3RSZWNvcmRlZEludGVybmFsUmV2aXNpb25OdW1iZXIgLSBsYXRlc3RQcm9kdWN0aXZlSXRl cmF0aW9uLmludGVybmFsUmV2aXNpb247Ci0gICAgICAgICAgICBpZiAoaW50ZXJuYWxSZXZpc2lv bnNCZWhpbmQgPCAwKQotICAgICAgICAgICAgICAgIGludGVybmFsUmV2aXNpb25zQmVoaW5kID0g MDsKLSAgICAgICAgICAgIGlmIChvcGVuU291cmNlUmV2aXNpb25zQmVoaW5kIHx8IGludGVybmFs UmV2aXNpb25zQmVoaW5kKQotICAgICAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dCA9IG9wZW5T b3VyY2VSZXZpc2lvbnNCZWhpbmQgKyAiIFx1ZmYwYiAiICsgaW50ZXJuYWxSZXZpc2lvbnNCZWhp bmQgKyAiIHJldmlzaW9ucyBiZWhpbmQiOwotICAgICAgICB9IGVsc2UgaWYgKG9wZW5Tb3VyY2VS ZXZpc2lvbnNCZWhpbmQpCi0gICAgICAgICAgICB2YXIgbWVzc2FnZVRleHQgPSBvcGVuU291cmNl UmV2aXNpb25zQmVoaW5kICsgIiAiICsgKG9wZW5Tb3VyY2VSZXZpc2lvbnNCZWhpbmQgPT09IDEg PyAicmV2aXNpb24gYmVoaW5kIiA6ICJyZXZpc2lvbnMgYmVoaW5kIik7CisgICAgICAgICAgICBp ZiAoaW50ZXJuYWxSZXZpc2lvbnNCZWhpbmQgPiAwKQorICAgICAgICAgICAgICAgIHRvdGFsUmV2 aXNpb25zQmVoaW5kICs9IGludGVybmFsUmV2aXNpb25zQmVoaW5kOworICAgICAgICB9CiAKLSAg ICAgICAgaWYgKCFtZXNzYWdlVGV4dCkKKyAgICAgICAgaWYgKCF0b3RhbFJldmlzaW9uc0JlaGlu ZCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgbWVzc2FnZUVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7IC8vIFdlIGNhbid0IGp1c3QgcGFzcyB0ZXh0 IHRvIFN0YXR1c0xpbmVWaWV3IGhlcmUsIGJlY2F1c2Ugd2UgbmVlZCBhbiBlbGVtZW50IHRoYXQg cGVyZmVjdGx5IGZpdHMgdGhlIHRleHQgZm9yIHBvcG92ZXIgcG9zaXRpb25pbmcuCi0gICAgICAg IG1lc3NhZ2VFbGVtZW50LnRleHRDb250ZW50ID0gbWVzc2FnZVRleHQ7CisgICAgICAgIG1lc3Nh Z2VFbGVtZW50LnRleHRDb250ZW50ID0gdG90YWxSZXZpc2lvbnNCZWhpbmQgKyAiICIgKyAodG90 YWxSZXZpc2lvbnNCZWhpbmQgPT09IDEgPyAicmV2aXNpb24gYmVoaW5kIiA6ICJyZXZpc2lvbnMg YmVoaW5kIik7CiAgICAgICAgIHZhciBzdGF0dXMgPSBuZXcgU3RhdHVzTGluZVZpZXcobWVzc2Fn ZUVsZW1lbnQsIFN0YXR1c0xpbmVWaWV3LlN0YXR1cy5Ob0J1YmJsZSk7CiAgICAgICAgIHRoaXMu ZWxlbWVudC5hcHBlbmRDaGlsZChzdGF0dXMuZWxlbWVudCk7CiAK