75854 2012-01-09 06:57:25 -0800 Fix style errors in CSSParser.cpp 2012-01-10 07:58:53 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zherczeg webkit-unassigned darin macpherson oliver webkit.review.bot oldest_to_newest 532165 0 zherczeg 2012-01-09 06:57:25 -0800 Move the style error fixes out from the CSS lexer patch. 532167 1 121665 zherczeg 2012-01-09 07:00:13 -0800 Created attachment 121665 patch 532170 2 webkit.review.bot 2012-01-09 07:03:32 -0800 Attachment 121665 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/css/CSSParser.cpp:916: One space before end of line comments [whitespace/comments] [5] Source/WebCore/css/CSSParser.cpp:930: One space before end of line comments [whitespace/comments] [5] Source/WebCore/css/CSSParser.cpp:1040: Missing spaces around | [whitespace/operators] [3] Source/WebCore/css/CSSParser.cpp:1411: One space before end of line comments [whitespace/comments] [5] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 533044 3 121665 zimmermann 2012-01-10 07:15:36 -0800 Comment on attachment 121665 patch r=me, Zoltan told me the other style errors are for consistency, with tons of existing comments in that switch. so r=me. 533075 4 121665 webkit.review.bot 2012-01-10 07:58:48 -0800 Comment on attachment 121665 patch Clearing flags on attachment: 121665 Committed r104576: <http://trac.webkit.org/changeset/104576> 533076 5 webkit.review.bot 2012-01-10 07:58:53 -0800 All reviewed patches have been landed. Closing bug. 121665 2012-01-09 07:00:13 -0800 2012-01-10 07:58:48 -0800 patch 0001-style.patch text/plain 8699 zherczeg RnJvbSBhNjZmMmQ5NjEwMGVmOTEzMmQ4OWZmN2NkMTdmMzI5Y2UyMWM1NmU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAd2Via2l0Lm9yZz4K RGF0ZTogTW9uLCA5IEphbiAyMDEyIDA2OjU4OjQyIC0wODAwClN1YmplY3Q6IFtQQVRDSF0gc3R5 bGUKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgfCAgIDE3ICsrKysrKysr KysrCiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCB8ICAgNTYgKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9u cygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDg3NDQzNzcuLjg5NjdkNWEgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wMS0wOSAgWm9sdGFuIEhlcmN6ZWcgIDx6 aGVyY3plZ0B3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBzdHlsZSBlcnJvcnMgaW4gQ1NTUGFy c2VyLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzU4NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN aW5vciBzdHlsZSBmaXhlcy4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNT U1BhcnNlcjo6cGFyc2VTaGFkb3cpOgorICAgICAgICAoV2ViQ29yZTo6aXNCb3JkZXJJbWFnZVJl cGVhdEtleXdvcmQpOgorICAgICAgICAoV2ViQ29yZTo6Qm9yZGVySW1hZ2VTbGljZVBhcnNlQ29u dGV4dDo6Y29tbWl0Qm9yZGVySW1hZ2VTbGljZSk6CisgICAgICAgIChXZWJDb3JlOjpCb3JkZXJJ bWFnZVF1YWRQYXJzZUNvbnRleHQ6OmNvbW1pdEJvcmRlckltYWdlUXVhZCk6CisgICAgICAgIChX ZWJDb3JlOjpmaWx0ZXJJbmZvRm9yTmFtZSk6CisKIDIwMTItMDEtMDUgIEFsbGFuIFNhbmRmZWxk IEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CiAKICAgICAgICAgRml4IHBvdGVudGlh bCBzdXBlcmxpbmVhciBydW50aW1lIG9mIG11bHRpcGxlIGluZGlyZWN0IGFkamVuY2VueSBjb21i aW5hdG9ycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggNzk0MGIyNy4uNDBmMmNmMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKQEAgLTkwNiwyOCArOTA2LDI4IEBAIGJvb2wgQ1NT UGFyc2VyOjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICBi cmVhazsKIAogICAgIGNhc2UgQ1NTUHJvcGVydHlQb3NpdGlvbjogICAgICAgICAgICAgLy8gc3Rh dGljIHwgcmVsYXRpdmUgfCBhYnNvbHV0ZSB8IGZpeGVkIHwgaW5oZXJpdAotICAgICAgICBpZiAo aWQgPT0gQ1NTVmFsdWVTdGF0aWMgfHwKLSAgICAgICAgICAgICBpZCA9PSBDU1NWYWx1ZVJlbGF0 aXZlIHx8Ci0gICAgICAgICAgICAgaWQgPT0gQ1NTVmFsdWVBYnNvbHV0ZSB8fAotICAgICAgICAg ICAgIGlkID09IENTU1ZhbHVlRml4ZWQpCisgICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZVN0YXRp YworICAgICAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVSZWxhdGl2ZQorICAgICAgICAgICAgfHwg aWQgPT0gQ1NTVmFsdWVBYnNvbHV0ZQorICAgICAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVGaXhl ZCkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAK LSAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrQWZ0ZXI6ICAgICAvLyBhdXRvIHwgYWx3YXlz IHwgYXZvaWQgfCBsZWZ0IHwgcmlnaHQgfCBpbmhlcml0CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh Z2VCcmVha0FmdGVyOiAgICAgICAvLyBhdXRvIHwgYWx3YXlzIHwgYXZvaWQgfCBsZWZ0IHwgcmln aHQgfCBpbmhlcml0CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0JlZm9yZToKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0Q29sdW1uQnJlYWtCZWZvcmU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJl Z2lvbkJyZWFrQWZ0ZXI6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVm b3JlOgotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvIHx8Ci0gICAgICAgICAgICAgaWQg PT0gQ1NTVmFsdWVBbHdheXMgfHwKLSAgICAgICAgICAgICBpZCA9PSBDU1NWYWx1ZUF2b2lkIHx8 Ci0gICAgICAgICAgICAgaWQgPT0gQ1NTVmFsdWVMZWZ0IHx8Ci0gICAgICAgICAgICAgaWQgPT0g Q1NTVmFsdWVSaWdodCkKKyAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlQXV0bworICAgICAgICAg ICAgfHwgaWQgPT0gQ1NTVmFsdWVBbHdheXMKKyAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVl QXZvaWQKKyAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVlTGVmdAorICAgICAgICAgICAgfHwg aWQgPT0gQ1NTVmFsdWVSaWdodCkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsK ICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlOiAg ICAvLyBhdm9pZCB8IGF1dG8gfCBpbmhlcml0CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVh a0luc2lkZTogICAgIC8vIGF2b2lkIHwgYXV0byB8IGluaGVyaXQKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJl Z2lvbkJyZWFrSW5zaWRlOgogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvIHx8IGlkID09 IENTU1ZhbHVlQXZvaWQpCkBAIC05MzUsOCArOTM1LDggQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNl VmFsdWUoaW50IHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIGJyZWFrOwogCiAgICAg Y2FzZSBDU1NQcm9wZXJ0eUVtcHR5Q2VsbHM6ICAgICAgICAgIC8vIHNob3cgfCBoaWRlIHwgaW5o ZXJpdAotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVTaG93IHx8Ci0gICAgICAgICAgICAgaWQg PT0gQ1NTVmFsdWVIaWRlKQorICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVTaG93CisgICAgICAg ICAgICB8fCBpZCA9PSBDU1NWYWx1ZUhpZGUpCiAgICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9 IHRydWU7CiAgICAgICAgIGJyZWFrOwogCkBAIC05NDUsMTEgKzk0NSwxMSBAQCBib29sIENTU1Bh cnNlcjo6cGFyc2VWYWx1ZShpbnQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgcmV0 dXJuIHBhcnNlQ29udGVudChwcm9wSWQsIGltcG9ydGFudCk7CiAKICAgICBjYXNlIENTU1Byb3Bl cnR5V2hpdGVTcGFjZTogICAgICAgICAgLy8gbm9ybWFsIHwgcHJlIHwgbm93cmFwIHwgaW5oZXJp dAotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVOb3JtYWwgfHwKLSAgICAgICAgICAgIGlkID09 IENTU1ZhbHVlUHJlIHx8Ci0gICAgICAgICAgICBpZCA9PSBDU1NWYWx1ZVByZVdyYXAgfHwKLSAg ICAgICAgICAgIGlkID09IENTU1ZhbHVlUHJlTGluZSB8fAotICAgICAgICAgICAgaWQgPT0gQ1NT VmFsdWVOb3dyYXApCisgICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZU5vcm1hbAorICAgICAgICAg ICAgfHwgaWQgPT0gQ1NTVmFsdWVQcmUKKyAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVlUHJl V3JhcAorICAgICAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVQcmVMaW5lCisgICAgICAgICAgICB8 fCBpZCA9PSBDU1NWYWx1ZU5vd3JhcCkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1 ZTsKICAgICAgICAgYnJlYWs7CiAKQEAgLTEwMzYsOCArMTAzNiw4IEBAIGJvb2wgQ1NTUGFyc2Vy OjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICBicmVhazsK IAogICAgIGNhc2UgQ1NTUHJvcGVydHlDbGVhcjogICAgICAgICAgICAgICAgLy8gbm9uZSB8IGxl ZnQgfCByaWdodCB8IGJvdGggfCBpbmhlcml0Ci0gICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZU5v bmUgfHwgaWQgPT0gQ1NTVmFsdWVMZWZ0IHx8Ci0gICAgICAgICAgICAgaWQgPT0gQ1NTVmFsdWVS aWdodHx8IGlkID09IENTU1ZhbHVlQm90aCkKKyAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9u ZSB8fCBpZCA9PSBDU1NWYWx1ZUxlZnQKKyAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVlUmln aHR8fCBpZCA9PSBDU1NWYWx1ZUJvdGgpCiAgICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHRy dWU7CiAgICAgICAgIGJyZWFrOwogCkBAIC0xMDQ1LDcgKzEwNDUsNyBAQCBib29sIENTU1BhcnNl cjo6cGFyc2VWYWx1ZShpbnQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgLy8gbGVm dCB8IHJpZ2h0IHwgY2VudGVyIHwganVzdGlmeSB8IHdlYmtpdF9sZWZ0IHwgd2Via2l0X3JpZ2h0 IHwgd2Via2l0X2NlbnRlciB8IHdlYmtpdF9tYXRjaF9wYXJlbnQgfAogICAgICAgICAvLyBzdGFy dCB8IGVuZCB8IDxzdHJpbmc+IHwgaW5oZXJpdAogICAgICAgICBpZiAoKGlkID49IENTU1ZhbHVl V2Via2l0QXV0byAmJiBpZCA8PSBDU1NWYWx1ZVdlYmtpdE1hdGNoUGFyZW50KSB8fCBpZCA9PSBD U1NWYWx1ZVN0YXJ0IHx8IGlkID09IENTU1ZhbHVlRW5kCi0gICAgICAgICAgICAgfHwgdmFsdWUt PnVuaXQgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpCisgICAgICAgICAgICB8fCB2 YWx1ZS0+dW5pdCA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORykKICAgICAgICAgICAg IHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAKQEAgLTE0MDgsNyArMTQw OCw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGJvb2wgaW1wb3J0 YW50KQogICAgICAgICAgICAgcmV0dXJuIHBhcnNlQ291bnRlcihwcm9wSWQsIDEsIGltcG9ydGFu dCk7CiAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0gICAg IGNhc2UgQ1NTUHJvcGVydHlDb3VudGVyUmVzZXQ6ICAgICAgICAvLyBbIDxpZGVudGlmaWVyPiA8 aW50ZWdlcj4/IF0rIHwgbm9uZSB8IGluaGVyaXQKKyAgICBjYXNlIENTU1Byb3BlcnR5Q291bnRl clJlc2V0OiAgICAgICAgLy8gWyA8aWRlbnRpZmllcj4gPGludGVnZXI+PyBdKyB8IG5vbmUgfCBp bmhlcml0CiAgICAgICAgIGlmIChpZCAhPSBDU1NWYWx1ZU5vbmUpCiAgICAgICAgICAgICByZXR1 cm4gcGFyc2VDb3VudGVyKHByb3BJZCwgMCwgaW1wb3J0YW50KTsKICAgICAgICAgdmFsaWRQcmlt aXRpdmUgPSB0cnVlOwpAQCAtMjAwOSw3ICsyMDA5LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNl VmFsdWUoaW50IHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdFRhcEhpZ2hsaWdodENvbG9yOgogICAgICAgICBpZiAoKGlkID49IENTU1ZhbHVlQXF1YSAm JiBpZCA8PSBDU1NWYWx1ZVdpbmRvd3RleHQpIHx8IGlkID09IENTU1ZhbHVlTWVudQogICAgICAg ICAgICAgfHwgKGlkID49IENTU1ZhbHVlV2Via2l0Rm9jdXNSaW5nQ29sb3IgJiYgaWQgPCBDU1NW YWx1ZVdlYmtpdFRleHQgJiYgIW1fc3RyaWN0KSkgewotICAgICAgICAgICAgIHZhbGlkUHJpbWl0 aXZlID0gdHJ1ZTsKKyAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gcGFyc2VDb2xvcigpOwogICAgICAg ICAgICAgaWYgKHBhcnNlZFZhbHVlKQpAQCAtNTE3MCw3ICs1MTcwLDcgQEAgUGFzc1JlZlB0cjxD U1NWYWx1ZUxpc3Q+IENTU1BhcnNlcjo6cGFyc2VTaGFkb3coQ1NTUGFyc2VyVmFsdWVMaXN0KiB2 YWx1ZUxpc3QsIGkKIAogICAgICAgICAgICAgaWYgKCFwYXJzZWRDb2xvciB8fCAhY29udGV4dC5h bGxvd0NvbG9yKQogICAgICAgICAgICAgICAgIHJldHVybiAwOyAvLyBUaGlzIHZhbHVlIGlzIG5v dCBhIGNvbG9yIG9yIGxlbmd0aCBhbmQgaXMgaW52YWxpZCBvcgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLy8gaXQgaXMgYSBjb2xvciwgYnV0IGEgY29sb3IgaXNuJ3QgYWxsb3dlZCBh dCB0aGlzIHBvaW50LgorICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBpdCBpcyBhIGNvbG9y LCBidXQgYSBjb2xvciBpc24ndCBhbGxvd2VkIGF0IHRoaXMgcG9pbnQuCiAKICAgICAgICAgICAg IGNvbnRleHQuY29tbWl0Q29sb3IocGFyc2VkQ29sb3IucmVsZWFzZSgpKTsKICAgICAgICAgfQpA QCAtNTQ1OCw3ICs1NDU4LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQm9yZGVySW1hZ2UoaW50 IHByb3BJZCwgUmVmUHRyPENTU1ZhbHVlPiYgcmVzdWx0KQogCiBzdGF0aWMgYm9vbCBpc0JvcmRl ckltYWdlUmVwZWF0S2V5d29yZChpbnQgaWQpCiB7Ci0gICAgIHJldHVybiBpZCA9PSBDU1NWYWx1 ZVN0cmV0Y2ggfHwgaWQgPT0gQ1NTVmFsdWVSZXBlYXQgfHwgaWQgPT0gQ1NTVmFsdWVTcGFjZSB8 fCBpZCA9PSBDU1NWYWx1ZVJvdW5kOworICAgIHJldHVybiBpZCA9PSBDU1NWYWx1ZVN0cmV0Y2gg fHwgaWQgPT0gQ1NTVmFsdWVSZXBlYXQgfHwgaWQgPT0gQ1NTVmFsdWVTcGFjZSB8fCBpZCA9PSBD U1NWYWx1ZVJvdW5kOwogfQogCiBib29sIENTU1BhcnNlcjo6cGFyc2VCb3JkZXJJbWFnZVJlcGVh dChSZWZQdHI8Q1NTVmFsdWU+JiByZXN1bHQpCkBAIC01NTQzLDcgKzU1NDMsNyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBtX2xlZnQgPSBtX2Nzc1ZhbHVlUG9vbC0+Y3JlYXRlVmFsdWUobV9yaWdo dC0+Z2V0RG91YmxlVmFsdWUoKSwgKENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMpbV9yaWdo dC0+cHJpbWl0aXZlVHlwZSgpKTsKICAgICAgICAgfQogICAgICAgICBpZiAoIW1fbGVmdCkKLSAg ICAgICAgICAgICBtX2xlZnQgPSBtX2Nzc1ZhbHVlUG9vbC0+Y3JlYXRlVmFsdWUobV9yaWdodC0+ Z2V0RG91YmxlVmFsdWUoKSwgKENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMpbV9yaWdodC0+ cHJpbWl0aXZlVHlwZSgpKTsKKyAgICAgICAgICAgIG1fbGVmdCA9IG1fY3NzVmFsdWVQb29sLT5j cmVhdGVWYWx1ZShtX3JpZ2h0LT5nZXREb3VibGVWYWx1ZSgpLCAoQ1NTUHJpbWl0aXZlVmFsdWU6 OlVuaXRUeXBlcyltX3JpZ2h0LT5wcmltaXRpdmVUeXBlKCkpOwogCiAgICAgICAgIC8vIE5vdyBi dWlsZCBhIHJlY3QgdmFsdWUgdG8gaG9sZCBhbGwgZm91ciBvZiBvdXIgcHJpbWl0aXZlIHZhbHVl cy4KICAgICAgICAgUmVmUHRyPFF1YWQ+IHF1YWQgPSBRdWFkOjpjcmVhdGUoKTsKQEAgLTU2NTks NyArNTY1OSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fbGVmdCA9IG1fY3NzVmFsdWVQb29s LT5jcmVhdGVWYWx1ZShtX3JpZ2h0LT5nZXREb3VibGVWYWx1ZSgpLCAoQ1NTUHJpbWl0aXZlVmFs dWU6OlVuaXRUeXBlcyltX3JpZ2h0LT5wcmltaXRpdmVUeXBlKCkpOwogICAgICAgICB9CiAgICAg ICAgIGlmICghbV9sZWZ0KQotICAgICAgICAgICAgIG1fbGVmdCA9IG1fY3NzVmFsdWVQb29sLT5j cmVhdGVWYWx1ZShtX3JpZ2h0LT5nZXREb3VibGVWYWx1ZSgpLCAoQ1NTUHJpbWl0aXZlVmFsdWU6 OlVuaXRUeXBlcyltX3JpZ2h0LT5wcmltaXRpdmVUeXBlKCkpOworICAgICAgICAgICAgbV9sZWZ0 ID0gbV9jc3NWYWx1ZVBvb2wtPmNyZWF0ZVZhbHVlKG1fcmlnaHQtPmdldERvdWJsZVZhbHVlKCks IChDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGVzKW1fcmlnaHQtPnByaW1pdGl2ZVR5cGUoKSk7 CiAKICAgICAgICAgLy8gTm93IGJ1aWxkIGEgcXVhZCB2YWx1ZSB0byBob2xkIGFsbCBmb3VyIG9m IG91ciBwcmltaXRpdmUgdmFsdWVzLgogICAgICAgICBSZWZQdHI8UXVhZD4gcXVhZCA9IFF1YWQ6 OmNyZWF0ZSgpOwpAQCAtNjYxOSw3ICs2NjE5LDcgQEAgc3RhdGljIHZvaWQgZmlsdGVySW5mb0Zv ck5hbWUoY29uc3QgQ1NTUGFyc2VyU3RyaW5nJiBuYW1lLCBXZWJLaXRDU1NGaWx0ZXJWYWx1ZToK ICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCAic2VwaWEoIikpCiAgICAgICAg IGZpbHRlclR5cGUgPSBXZWJLaXRDU1NGaWx0ZXJWYWx1ZTo6U2VwaWFGaWx0ZXJPcGVyYXRpb247 CiAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgInNhdHVyYXRlKCIpKQotICAg ICAgIGZpbHRlclR5cGUgPSBXZWJLaXRDU1NGaWx0ZXJWYWx1ZTo6U2F0dXJhdGVGaWx0ZXJPcGVy YXRpb247CisgICAgICAgIGZpbHRlclR5cGUgPSBXZWJLaXRDU1NGaWx0ZXJWYWx1ZTo6U2F0dXJh dGVGaWx0ZXJPcGVyYXRpb247CiAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwg Imh1ZS1yb3RhdGUoIikpCiAgICAgICAgIGZpbHRlclR5cGUgPSBXZWJLaXRDU1NGaWx0ZXJWYWx1 ZTo6SHVlUm90YXRlRmlsdGVyT3BlcmF0aW9uOwogICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdD YXNlKG5hbWUsICJpbnZlcnQoIikpCi0tIAoxLjcuMi41Cgo=