78716 2012-02-15 07:19:23 -0800 Web Inspector: explicitly mark undoable state from the front-end. 2012-02-16 07:39:00 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 557254 0 pfeldman 2012-02-15 07:19:23 -0800 Patch to follow. 557255 1 127183 pfeldman 2012-02-15 07:21:06 -0800 Created attachment 127183 Patch 558181 2 pfeldman 2012-02-16 07:39:00 -0800 Committed r107935: <http://trac.webkit.org/changeset/107935> 127183 2012-02-15 07:21:06 -0800 2012-02-16 05:58:47 -0800 Patch bug-78716-20120215192104.patch text/plain 13060 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAxZjA2NDAzM2UyZDJm MzUxMjdhNzQxMDk0NTllMTBmNDg1NGU4My4uMzA4OTM4NjY3N2ZiYzQ1Yzg2MTY2ZDQ5YWI2Yjdi Nzg4MzUzZTEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTAyLTE1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBleHBsaWNpdGx5IG1hcmsgdW5kb2FibGUgc3RhdGUgZnJvbSB0aGUgZnJvbnQtZW5kLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg3MTYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDU1NBZ2Vu dDo6dG9nZ2xlUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6 OnNldFJ1bGVTZWxlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDU1NBZ2VudDo6 YWRkUnVsZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpzZXRBdHRyaWJ1dGVWYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlc0FzVGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6cmVtb3ZlQXR0cmlidXRlKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpyZW1vdmVOb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpzZXROb2RlTmFtZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0T3V0ZXJIVE1MKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50OjpzZXROb2RlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6Om1vdmVUbyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckhpc3RvcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySGlzdG9yeTo6cmVkbyk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckhpc3RvcnkuaDoKKyAgICAgICAgKEluc3Bl Y3Rvckhpc3RvcnkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2Rl bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5zZXRS dWxlU2VsZWN0b3IuY2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9k ZWwucHJvdG90eXBlLnNldFJ1bGVTZWxlY3Rvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVNb2RlbC5wcm90b3R5cGUuYWRkUnVsZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuYWRkUnVsZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuc2V0U3R5bGVTaGVldFRleHQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNTU1Byb3BlcnR5LnByb3RvdHlwZS5zZXRUZXh0LmNhbGxiYWNrKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NQcm9wZXJ0eS5wcm90b3R5cGUuc2V0VGV4dCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90eXBlLnNldERpc2FibGVkLmNh bGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NQcm9wZXJ0eS5wcm90b3R5cGUuc2V0 RGlzYWJsZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQucHJvdG90eXBl LnNldFRleHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLl9tYXJrUmV2aXNpb24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZS5nZXQgbWFya1VuZG9hYmxl U3RhdGUpOgorCiAyMDEyLTAyLTEzICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtJbnNwZWN0b3JJbmRleGVkREJdIFBhc3Mg ZGF0YSBlbnRyaWVzIGZyb20gb2JqZWN0IHN0b3JlcyBhbmQgaW5kZXhlcyB0byBmcm9udC1lbmQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRl eCA1NGNhOWEyNzkyMjEzMDAzZmJmODg3Yzc4MzZjMzliNGI0YWRlYjY2Li4xZjRmNzEzYThjOTVj YmJiYzRmYTUxNjU5YzVhNTBkNzQ0NjdhYTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTcxMSw3ICs3MTEsNiBAQCB2b2lkIEluc3Bl Y3RvckNTU0FnZW50Ojp0b2dnbGVQcm9wZXJ0eShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNv bnN0IFJlZlB0cjxJbgogICAgIGlmIChzdWNjZXNzKQogICAgICAgICByZXN1bHQgPSBpbnNwZWN0 b3JTdHlsZVNoZWV0LT5idWlsZE9iamVjdEZvclN0eWxlKGluc3BlY3RvclN0eWxlU2hlZXQtPnN0 eWxlRm9ySWQoY29tcG91bmRJZCkpOwogICAgICplcnJvclN0cmluZyA9IEluc3BlY3RvckRPTUFn ZW50Ojp0b0Vycm9yU3RyaW5nKGVjKTsKLSAgICBtX2RvbUFnZW50LT5oaXN0b3J5KCktPm1hcmtV bmRvYWJsZVN0YXRlKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OnNldFJ1bGVTZWxl Y3RvcihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+JiBmdWxsUnVsZUlkLCBjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiYgcmVzdWx0KQpAQCAtNzMxLDcgKzczMCw2IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdl bnQ6OnNldFJ1bGVTZWxlY3RvcihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFJlZlB0 cjxJCiAKICAgICBpZiAoc3VjY2VzcykKICAgICAgICAgcmVzdWx0ID0gaW5zcGVjdG9yU3R5bGVT aGVldC0+YnVpbGRPYmplY3RGb3JSdWxlKGluc3BlY3RvclN0eWxlU2hlZXQtPnJ1bGVGb3JJZChj b21wb3VuZElkKSk7Ci0gICAgbV9kb21BZ2VudC0+aGlzdG9yeSgpLT5tYXJrVW5kb2FibGVTdGF0 ZSgpOwogfQogCiB2b2lkIEluc3BlY3RvckNTU0FnZW50OjphZGRSdWxlKEVycm9yU3RyaW5nKiBl cnJvclN0cmluZywgY29uc3QgaW50IGNvbnRleHROb2RlSWQsIGNvbnN0IFN0cmluZyYgc2VsZWN0 b3IsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiByZXN1bHQpCkBAIC03NTgsNyArNzU2LDYgQEAg dm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6YWRkUnVsZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcs IGNvbnN0IGludCBjb250ZXh0Tm9kZUkKICAgICBJbnNwZWN0b3JDU1NJZCBydWxlSWQgPSByYXdB Y3Rpb24tPm5ld1J1bGVJZCgpOwogICAgIENTU1N0eWxlUnVsZSogcnVsZSA9IGluc3BlY3RvclN0 eWxlU2hlZXQtPnJ1bGVGb3JJZChydWxlSWQpOwogICAgIHJlc3VsdCA9IGluc3BlY3RvclN0eWxl U2hlZXQtPmJ1aWxkT2JqZWN0Rm9yUnVsZShydWxlKTsKLSAgICBtX2RvbUFnZW50LT5oaXN0b3J5 KCktPm1hcmtVbmRvYWJsZVN0YXRlKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6Omdl dFN1cHBvcnRlZENTU1Byb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJy YXk+JiBjc3NQcm9wZXJ0aWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHAKaW5kZXggNWViM2VlOWFlZWFmOWQyYWM2YmVjNTIwMzk0OTgxZjUwNjhh Y2ZiOS4uNmVhNjhhNTk1YTQ0Y2Y5NDY3NTkxNThjYTU3N2ZiZTQ4MjVhZDE0YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC01MzgsNyAr NTM4LDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlVmFsdWUoRXJyb3JT dHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgZWxlbWVudEkKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9kb21FZGl0b3ItPnNldEF0dHJpYnV0ZShlbGVtZW50LCBuYW1lLCB2YWx1ZSwgZXJyb3JTdHJp bmcpOwotICAgIG1faGlzdG9yeS0+bWFya1VuZG9hYmxlU3RhdGUoKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlc0FzVGV4dChFcnJvclN0cmluZyogZXJyb3JTdHJp bmcsIGludCBlbGVtZW50SWQsIGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgU3RyaW5nKiBjb25z dCBuYW1lKQpAQCAtNTY5LDcgKzU2OCw2IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldEF0 dHJpYnV0ZXNBc1RleHQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgZWxlbWVuCiAgICAg RWxlbWVudCogY2hpbGRFbGVtZW50ID0gdG9FbGVtZW50KGNoaWxkKTsKICAgICBpZiAoIWNoaWxk RWxlbWVudC0+aGFzQXR0cmlidXRlcygpICYmIG5hbWUpIHsKICAgICAgICAgbV9kb21FZGl0b3It PnJlbW92ZUF0dHJpYnV0ZShlbGVtZW50LCAqbmFtZSwgZXJyb3JTdHJpbmcpOwotICAgICAgICBt X2hpc3RvcnktPm1hcmtVbmRvYWJsZVN0YXRlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTU4NSw4ICs1ODMsNiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXRBdHRyaWJ1dGVz QXNUZXh0KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IGVsZW1lbgogCiAgICAgaWYgKCFm b3VuZE9yaWdpbmFsQXR0cmlidXRlICYmIG5hbWUgJiYgIW5hbWUtPnN0cmlwV2hpdGVTcGFjZSgp LmlzRW1wdHkoKSkKICAgICAgICAgbV9kb21FZGl0b3ItPnJlbW92ZUF0dHJpYnV0ZShlbGVtZW50 LCAqbmFtZSwgZXJyb3JTdHJpbmcpOwotCi0gICAgbV9oaXN0b3J5LT5tYXJrVW5kb2FibGVTdGF0 ZSgpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpyZW1vdmVBdHRyaWJ1dGUoRXJyb3JT dHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUpCkBA IC01OTYsNyArNTkyLDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6cmVtb3ZlQXR0cmlidXRl KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IGVsZW1lbnRJZCwKICAgICAgICAgcmV0dXJu OwogCiAgICAgbV9kb21FZGl0b3ItPnJlbW92ZUF0dHJpYnV0ZShlbGVtZW50LCBuYW1lLCBlcnJv clN0cmluZyk7Ci0gICAgbV9oaXN0b3J5LT5tYXJrVW5kb2FibGVTdGF0ZSgpOwogfQogCiB2b2lk IEluc3BlY3RvckRPTUFnZW50OjpyZW1vdmVOb2RlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywg aW50IG5vZGVJZCkKQEAgLTYxMiw3ICs2MDcsNiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpy ZW1vdmVOb2RlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJZCkKICAgICB9CiAK ICAgICBtX2RvbUVkaXRvci0+cmVtb3ZlQ2hpbGQocGFyZW50Tm9kZSwgbm9kZSwgZXJyb3JTdHJp bmcpOwotICAgIG1faGlzdG9yeS0+bWFya1VuZG9hYmxlU3RhdGUoKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6c2V0Tm9kZU5hbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQg bm9kZUlkLCBjb25zdCBTdHJpbmcmIHRhZ05hbWUsIGludCogbmV3SWQpCkBAIC02NDQsNyArNjM4 LDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0Tm9kZU5hbWUoRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nLCBpbnQgbm9kZUlkLCBjb25zdAogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFt X2RvbUVkaXRvci0+cmVtb3ZlQ2hpbGQocGFyZW50LCBvbGROb2RlLCBlcnJvclN0cmluZykpCiAg ICAgICAgIHJldHVybjsKLSAgICBtX2hpc3RvcnktPm1hcmtVbmRvYWJsZVN0YXRlKCk7CiAKICAg ICAqbmV3SWQgPSBwdXNoTm9kZVBhdGhUb0Zyb250ZW5kKG5ld0VsZW0uZ2V0KCkpOwogICAgIGlm IChtX2NoaWxkcmVuUmVxdWVzdGVkLmNvbnRhaW5zKG5vZGVJZCkpCkBAIC02ODEsNyArNjc0LDYg QEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6c2V0T3V0ZXJIVE1MKEVycm9yU3RyaW5nKiBlcnJv clN0cmluZywgaW50IG5vZGVJZCwgY29uc3QKICAgICBOb2RlKiBuZXdOb2RlID0gMDsKICAgICBp ZiAoIW1fZG9tRWRpdG9yLT5zZXRPdXRlckhUTUwobm9kZSwgb3V0ZXJIVE1MLCAmbmV3Tm9kZSwg ZXJyb3JTdHJpbmcpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9oaXN0b3J5LT5tYXJrVW5kb2Fi bGVTdGF0ZSgpOwogCiAgICAgaWYgKCFuZXdOb2RlKSB7CiAgICAgICAgIC8vIFRoZSBvbmx5IGNo aWxkIG5vZGUgaGFzIGJlZW4gZGVsZXRlZC4KQEAgLTcwNyw3ICs2OTksNiBAQCB2b2lkIEluc3Bl Y3RvckRPTUFnZW50OjpzZXROb2RlVmFsdWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQg bm9kZUlkLCBjb25zdAogICAgIH0KIAogICAgIG1fZG9tRWRpdG9yLT5yZXBsYWNlV2hvbGVUZXh0 KHRvVGV4dChub2RlKSwgdmFsdWUsIGVycm9yU3RyaW5nKTsKLSAgICBtX2hpc3RvcnktPm1hcmtV bmRvYWJsZVN0YXRlKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmdldEV2ZW50TGlz dGVuZXJzRm9yTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JB cnJheT4mIGxpc3RlbmVyc0FycmF5KQpAQCAtMTA2Nyw3ICsxMDU4LDYgQEAgdm9pZCBJbnNwZWN0 b3JET01BZ2VudDo6bW92ZVRvKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJZCwg aW50IHRhcmdldEUKIAogICAgIGlmICghbV9kb21FZGl0b3ItPmluc2VydEJlZm9yZSh0YXJnZXRF bGVtZW50LCBub2RlLCBhbmNob3JOb2RlLCBlcnJvclN0cmluZykpCiAgICAgICAgIHJldHVybjsK LSAgICBtX2hpc3RvcnktPm1hcmtVbmRvYWJsZVN0YXRlKCk7CiAKICAgICAqbmV3Tm9kZUlkID0g cHVzaE5vZGVQYXRoVG9Gcm9udGVuZChub2RlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIaXN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JIaXN0b3J5LmNwcAppbmRleCBmOWRiNWM2NWQ4ZGRkMTcyNzhlODI5YjJl ZGMyOTFhMGI1YzIwMjJmLi4zOTNjYmE1OThkMzBlMjcwZmQwNTM4NTAyNTdiMjc1OWY4NDQ2MmEz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGlzdG9yeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckhpc3RvcnkuY3BwCkBA IC0xMzQsNyArMTM0LDcgQEAgYm9vbCBJbnNwZWN0b3JIaXN0b3J5OjpyZWRvKEV4Y2VwdGlvbkNv ZGUmIGVjKQogICAgIHdoaWxlIChtX2FmdGVyTGFzdEFjdGlvbkluZGV4IDwgbV9oaXN0b3J5LnNp emUoKSkgewogICAgICAgICBBY3Rpb24qIGFjdGlvbiA9IG1faGlzdG9yeVttX2FmdGVyTGFzdEFj dGlvbkluZGV4XS5nZXQoKTsKICAgICAgICAgaWYgKCFhY3Rpb24tPnJlZG8oZWMpKSB7Ci0gICAg ICAgICAgICBtX2hpc3RvcnkucmVzaXplKG1fYWZ0ZXJMYXN0QWN0aW9uSW5kZXgpOworICAgICAg ICAgICAgbV9oaXN0b3J5LmNsZWFyKCk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KICAgICAgICAgKyttX2FmdGVyTGFzdEFjdGlvbkluZGV4OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckhpc3RvcnkuaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JIaXN0b3J5LmgKaW5kZXggYjA0N2NlYjExMDIzMDg3MTk0NzU5 NmQxNDA1NzNkNDAyYmRjNTBlNS4uMDM3MzQ0YjYwZjYwOTUwODFhOTU2OTUwMGVlYzBkY2Q2NDFk ZGMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckhpc3Rv cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGlzdG9yeS5oCkBA IC03OCw3ICs3OCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc2V0KCk7CiAKIHByaXZhdGU6Ci0g ICAgdm9pZCBkdW1wKCk7CiAgICAgVmVjdG9yPE93blB0cjxBY3Rpb24+ID4gbV9oaXN0b3J5Owog ICAgIHNpemVfdCBtX2FmdGVyTGFzdEFjdGlvbkluZGV4OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwppbmRleCBmZTE2ZmZh NGY5YWNmNGI5YmNjMzExZmVkNWM3MzEwMzUwYjliZGQyLi5lY2RiZmQzMDg0OGIzYjY3MGEyMjg1 YmNhZWM2NjVhZjBhYTAwZjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCkBAIC0xOTEsNiArMTkxLDcgQEAgV2ViSW5zcGVj dG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKGVycm9yKQog ICAgICAgICAgICAgICAgIGZhaWx1cmVDYWxsYmFjaygpOwogICAgICAgICAgICAgZWxzZSB7Cisg ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm1hcmtVbmRvYWJsZVN0YXRlKCk7 CiAgICAgICAgICAgICAgICAgdmFyIG93bmVyRG9jdW1lbnRJZCA9IHRoaXMuX293bmVyRG9jdW1l bnRJZChub2RlSWQpOwogICAgICAgICAgICAgICAgIGlmIChvd25lckRvY3VtZW50SWQpCiAgICAg ICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG93 bmVyRG9jdW1lbnRJZCwgbmV3U2VsZWN0b3IsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhp cywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CkBAIC0yMzUsNiArMjM2 LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgICAgIC8vIEludmFsaWQgc3ludGF4IGZvciBhIHNlbGVjdG9yCiAgICAgICAgICAgICAgICAg ZmFpbHVyZUNhbGxiYWNrKCk7CiAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21BZ2VudC5tYXJrVW5kb2FibGVTdGF0ZSgpOwogICAgICAgICAgICAg ICAgIHZhciBvd25lckRvY3VtZW50SWQgPSB0aGlzLl9vd25lckRvY3VtZW50SWQobm9kZUlkKTsK ICAgICAgICAgICAgICAgICBpZiAob3duZXJEb2N1bWVudElkKQogICAgICAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQucXVlcnlTZWxlY3RvckFsbChvd25lckRvY3VtZW50SWQs IHNlbGVjdG9yLCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vz c0NhbGxiYWNrLCBydWxlUGF5bG9hZCkpOwpAQCAtMjg0LDEzICsyODYsMTQgQEAgV2ViSW5zcGVj dG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBjYWxsYmFj ayhlcnJvcikKICAgICAgICAgewogICAgICAgICAgICAgdGhpcy5fcGVuZGluZ0NvbW1hbmRzTWFq b3JTdGF0ZS5wb3AoKTsKKyAgICAgICAgICAgIGlmICghZXJyb3IgJiYgbWFqb3JDaGFuZ2UpCisg ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm1hcmtVbmRvYWJsZVN0YXRlKCk7 CisgICAgICAgICAgICAKICAgICAgICAgICAgIGlmICghZXJyb3IgJiYgdXNlckNhbGxiYWNrKQog ICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFjayhlcnJvcik7CiAgICAgICAgIH0KICAgICAgICAg dGhpcy5fcGVuZGluZ0NvbW1hbmRzTWFqb3JTdGF0ZS5wdXNoKG1ham9yQ2hhbmdlKTsKICAgICAg ICAgQ1NTQWdlbnQuc2V0U3R5bGVTaGVldFRleHQoc3R5bGVTaGVldElkLCBuZXdUZXh0LCBjYWxs YmFjay5iaW5kKHRoaXMpKTsKLSAgICAgICAgaWYgKG1ham9yQ2hhbmdlKQotICAgICAgICAgICAg RE9NQWdlbnQubWFya1VuZG9hYmxlU3RhdGUoKTsKICAgICB9LAogCiAgICAgX3VuZG9SZWRvUmVx dWVzdGVkOiBmdW5jdGlvbigpCkBAIC02MjksNiArNjMyLDggQEAgV2ViSW5zcGVjdG9yLkNTU1By b3BlcnR5LnByb3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmNzc01vZGVsLl9wZW5kaW5nQ29tbWFuZHNNYWpvclN0YXRlLnBvcCgpOwogICAgICAgICAgICAg aWYgKCFlcnJvcikgeworICAgICAgICAgICAgICAgIGlmIChtYWpvckNoYW5nZSkKKyAgICAgICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm1hcmtVbmRvYWJsZVN0YXRlKCk7CiAg ICAgICAgICAgICAgICAgdGhpcy50ZXh0ID0gcHJvcGVydHlUZXh0OwogICAgICAgICAgICAgICAg IHZhciBzdHlsZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9h ZChzdHlsZVBheWxvYWQpOwogICAgICAgICAgICAgICAgIHZhciBuZXdQcm9wZXJ0eSA9IHN0eWxl LmFsbFByb3BlcnRpZXNbdGhpcy5pbmRleF07CkBAIC02NTIsOCArNjU3LDYgQEAgV2ViSW5zcGVj dG9yLkNTU1Byb3BlcnR5LnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gQW4gaW5kZXggcGFzdCBh bGwgdGhlIHByb3BlcnRpZXMgYWRkcyBhIG5ldyBwcm9wZXJ0eSB0byB0aGUgc3R5bGUuCiAgICAg ICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5fcGVuZGluZ0NvbW1hbmRzTWFqb3JTdGF0ZS5wdXNo KG1ham9yQ2hhbmdlKTsKICAgICAgICAgQ1NTQWdlbnQuc2V0UHJvcGVydHlUZXh0KHRoaXMub3du ZXJTdHlsZS5pZCwgdGhpcy5pbmRleCwgcHJvcGVydHlUZXh0LCB0aGlzLmluZGV4IDwgdGhpcy5v d25lclN0eWxlLnBhc3RMYXN0U291cmNlUHJvcGVydHlJbmRleCgpLCBjYWxsYmFjay5iaW5kKHRo aXMpKTsKLSAgICAgICAgaWYgKG1ham9yQ2hhbmdlKQotICAgICAgICAgICAgRE9NQWdlbnQubWFy a1VuZG9hYmxlU3RhdGUoKTsKICAgICB9LAogCiAgICAgc2V0VmFsdWU6IGZ1bmN0aW9uKG5ld1Zh bHVlLCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNrKQpAQCAtNjc3LDYgKzY4MCw3IEBAIFdlYklu c3BlY3Rvci5DU1NQcm9wZXJ0eS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHVz ZXJDYWxsYmFjayhudWxsKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9 CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubWFya1VuZG9hYmxlU3RhdGUoKTsK ICAgICAgICAgICAgIGlmICh1c2VyQ2FsbGJhY2spIHsKICAgICAgICAgICAgICAgICB2YXIgc3R5 bGUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wYXJzZVBheWxvYWQoc3R5bGVQ YXlsb2FkKTsKICAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soc3R5bGUpOwpAQCAtNzYwLDYg Kzc2NCw5IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yKQogICAgICAgICB7CisgICAgICAgICAg ICBpZiAoIWVycm9yKQorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5tYXJr VW5kb2FibGVTdGF0ZSgpOworCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3Bl bmRpbmdDb21tYW5kc01ham9yU3RhdGUucG9wKCk7CiAgICAgICAgICAgICBpZiAodXNlckNhbGxi YWNrKQogICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFjayhlcnJvcik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCBlZjcwOGM0M2QwN2Vi N2FhNzFiMTY5YWRlZTE0NzJhNzQ5NzdiNjE0Li5kNjg2ZmE3MmZhNTIzMWM5Y2FiMzFjNDljNmQ4 NjBlMjBjY2I2NzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTUFnZW50LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQWdlbnQuanMKQEAgLTExMTcsNiArMTExNyw5IEBAIFdlYkluc3BlY3Rvci5ET01BZ2VudC5w cm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBmdW5jdGlvbiB3cmFwcGVyRnVuY3Rpb24oZXJy b3IpCiAgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghZXJyb3IpCisgICAgICAgICAgICAgICAg dGhpcy5tYXJrVW5kb2FibGVTdGF0ZSgpOworCiAgICAgICAgICAgICBpZiAoY2FsbGJhY2spCiAg ICAgICAgICAgICAgICAgY2FsbGJhY2suYXBwbHkodGhpcywgYXJndW1lbnRzKTsKICAgICAgICAg ICAgIGlmIChlcnJvciB8fCAhV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3MuZnJlZUZs b3dET01FZGl0aW5nLmlzRW5hYmxlZCgpKQpAQCAtMTE2Myw2ICsxMTY2LDExIEBAIFdlYkluc3Bl Y3Rvci5ET01BZ2VudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIERPTUFnZW50LnNldFRvdWNoRW11 bGF0aW9uRW5hYmxlZChXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZW11bGF0ZVRvdWNoRXZlbnRzLmdl dCgpKTsKICAgICB9LAogCisgICAgbWFya1VuZG9hYmxlU3RhdGU6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIERPTUFnZW50Lm1hcmtVbmRvYWJsZVN0YXRlKCk7CisgICAgfSwKKwogICAgIC8q KgogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP1Byb3RvY29sLkVycm9yKT19IGNhbGxiYWNrCiAg ICAgICovCg==