73333 2011-11-29 10:20:40 -0800 DOM wrapper cache doesn't need to use JSDOMWrapper 2011-11-29 10:32:56 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 510885 0 oliver 2011-11-29 10:20:40 -0800 DOM wrapper cache doesn't need to use JSDOMWrapper 510887 1 116994 oliver 2011-11-29 10:22:55 -0800 Created attachment 116994 Patch 510894 2 oliver 2011-11-29 10:32:56 -0800 Committed r101396: <http://trac.webkit.org/changeset/101396> 116994 2011-11-29 10:22:55 -0800 2011-11-29 10:31:06 -0800 Patch bug-73333-20111129102253.patch text/plain 13449 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk4ODhjOWFhN2Y3Yjg1 ZWIxODMxNWJlM2U1Yzk0MWI2ZTkxNGNlOC4uYWQxMzhkYzIzMjFkMTcxYmM2MzIzMGFlZDJkYTYx YmM1MmM5N2U2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDExLTExLTI5ICBPbGl2 ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisKKyAgICAgICAgRE9NIHdyYXBwZXIgY2FjaGUg ZG9lc24ndCBuZWVkIHRvIHVzZSBKU0RPTVdyYXBwZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBKU0RPTVdyYXBwZXJDYWNoZSB1c2UgSlNPYmpl Y3QgcmF0aGVyIHRoYW4gSlNET01XcmFwcGVyCisgICAgICAgIGFuZCBwcm9wYWdhdGUgdGhlIHR5 cGUgY2hhbmdlIG91dC4gCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9ET01XcmFwcGVyV29ybGQu aDoKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0FycmF5QnVmZmVyVmlld0hlbHBlci5oOgorICAg ICAgICAoV2ViQ29yZTo6dG9KU0FycmF5QnVmZmVyVmlldyk6CisgICAgICAgICogYmluZGluZ3Mv anMvSlNDU1NSdWxlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTQ1NTVmFsdWVDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 dG9KUyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmg6CisgICAgICAgIChX ZWJDb3JlOjpzZXRJbmxpbmVDYWNoZWRXcmFwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmNsZWFy SW5saW5lQ2FjaGVkV3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpnZXRDYWNoZWRXcmFwcGVy KToKKyAgICAgICAgKFdlYkNvcmU6OmNhY2hlV3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjp3 cmFwKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvdzo6aGlzdG9yeSk6CisgICAgICAgIChXZWJDb3JlOjpK U0RPTVdpbmRvdzo6bG9jYXRpb24pOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRG9jdW1lbnRD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNEb2N1bWVudDo6bG9jYXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNFdmVudEN1c3Rv bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0hUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL0pTSW1hZ2VEYXRhQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTU1ZHUGF0aFNlZ0N1c3RvbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1N0eWxl U2hlZXRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAgICAgICogYmlu ZGluZ3MvanMvSlNUcmFja0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKwog MjAxMS0xMS0yOSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgR1RLIGJ1aWxkIGZpeCBhZnRlciByMTAxMzkyLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvRE9NV3JhcHBlcldvcmxkLmggYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9ET01XcmFwcGVyV29ybGQuaAppbmRleCAzN2E5NmFlMDMzN2Q4 YWY1ODQ0MWQ1YTBlNTc4MzMxOGExZWQwNjZmLi5lYjk5YTY4ZjkxYzQ3MWQzYThlODU4MjZmMzBh ZmNkYzlmMWE1ODZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9ET01X cmFwcGVyV29ybGQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9ET01XcmFwcGVy V29ybGQuaApAQCAtMzMsNyArMzMsNyBAQCBjbGFzcyBDU1NWYWx1ZTsKIGNsYXNzIEpTRE9NV3Jh cHBlcjsKIGNsYXNzIFNjcmlwdENvbnRyb2xsZXI7CiAKLXR5cGVkZWYgSGFzaE1hcDx2b2lkKiwg SlNDOjpXZWFrPEpTRE9NV3JhcHBlcj4gPiBET01PYmplY3RXcmFwcGVyTWFwOwordHlwZWRlZiBI YXNoTWFwPHZvaWQqLCBKU0M6OldlYWs8SlNDOjpKU09iamVjdD4gPiBET01PYmplY3RXcmFwcGVy TWFwOwogdHlwZWRlZiBIYXNoTWFwPFN0cmluZ0ltcGwqLCBKU0M6OldlYWs8SlNDOjpKU1N0cmlu Zz4gPiBKU1N0cmluZ0NhY2hlOwogCiBjbGFzcyBKU0RPTVdyYXBwZXJPd25lciA6IHB1YmxpYyBK U0M6OldlYWtIYW5kbGVPd25lciB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0FycmF5QnVmZmVyVmlld0hlbHBlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNBcnJheUJ1ZmZlclZpZXdIZWxwZXIuaAppbmRleCBkZjllNDM5MDY0MDRkNDg1ODg4Mzhi MGI5NmY0ZTdkZGNkNWI5Yzg0Li4wYjZiODA1YmYyOGZjNDE2MTEyYTgzYzU3NjU4OWJmMWExMGUy YTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0FycmF5QnVmZmVy Vmlld0hlbHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQXJyYXlCdWZm ZXJWaWV3SGVscGVyLmgKQEAgLTE2OCw3ICsxNjgsNyBAQCBzdGF0aWMgSlNDOjpKU1ZhbHVlIHRv SlNBcnJheUJ1ZmZlclZpZXcoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0 KgogICAgIGlmICghb2JqZWN0KQogICAgICAgICByZXR1cm4gSlNDOjpqc051bGwoKTsKIAotICAg IGlmIChKU0RPTVdyYXBwZXIqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3Js ZChleGVjKSwgb2JqZWN0KSkKKyAgICBpZiAoSlNDOjpKU09iamVjdCogd3JhcHBlciA9IGdldENh Y2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBvYmplY3QpKQogICAgICAgICByZXR1cm4g d3JhcHBlcjsKIAogICAgIGV4ZWMtPmhlYXAoKS0+cmVwb3J0RXh0cmFNZW1vcnlDb3N0KG9iamVj dC0+Ynl0ZUxlbmd0aCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTQ1NTUnVsZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1J1 bGVDdXN0b20uY3BwCmluZGV4IDkwNWIwMzYwNmI2OTk3OTdlZWZlNjIxZDc0ZGZhYTM5OTc1NGY4 ZGMuLmYzN2M3YmUxMjczZmFjMzVjMzRhZDU2ODliZjZmYmE0OWFjZTU5YjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVsZUN1c3RvbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NSdWxlQ3VzdG9tLmNwcApAQCAtNjMsNyArNjMs NyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBDU1NSdWxlKiBydWxlKQogICAgIGlmICghcnVsZSkKICAgICAgICAgcmV0dXJu IGpzTnVsbCgpOwogCi0gICAgSlNET01XcmFwcGVyKiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBl cihjdXJyZW50V29ybGQoZXhlYyksIHJ1bGUpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0 Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIHJ1bGUpOwogICAgIGlmICh3cmFwcGVy KQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNDU1NWYWx1ZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0NTU1ZhbHVlQ3VzdG9tLmNwcAppbmRleCAwZWZiNGJiNGI4M2QyNzllODE3NGU3Yjk3 MGI5YTcwYzUyOTE1ODQ3Li5jOWIzYjRiMTY2N2YwNTMwMzM3ZjQyODM2Y2Y0OTczYTM3OTZiYTU3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1ZhbHVlQ3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1ZhbHVlQ3VzdG9tLmNw cApAQCAtNzYsNyArNzYsNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgaWYgKCF2YWx1 ZSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNET01XcmFwcGVyKiB3cmFwcGVy ID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIHZhbHVlKTsKKyAgICBKU09i amVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCB2YWx1 ZSk7CiAKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCmluZGV4IDEyYWI5ZjE4Y2RkYWU4Nzhj ZDkxMjU5MDc5Y2M1MWU2NGQxYTkxNDIuLjc4ZTgyNGEzZDU2MzMyY2NjNGVkOWRiY2E5ZjFjMDA1 ZDdkOTRlZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmlu ZGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCkBA IC0xMjQsMjIgKzEyNCwyMiBAQCBlbnVtIFBhcmFtZXRlck1pc3NpbmdQb2xpY3kgewogCiAgICAg Ly8gT3ZlcmxvYWQgdGhlc2UgZnVuY3Rpb25zIHRvIHByb3ZpZGUgYSBmYXN0IHBhdGggZm9yIHdy YXBwZXIgYWNjZXNzLgogICAgIGlubGluZSBKU0RPTVdyYXBwZXIqIGdldElubGluZUNhY2hlZFdy YXBwZXIoRE9NV3JhcHBlcldvcmxkKiwgdm9pZCopIHsgcmV0dXJuIDA7IH0KLSAgICBpbmxpbmUg Ym9vbCBzZXRJbmxpbmVDYWNoZWRXcmFwcGVyKERPTVdyYXBwZXJXb3JsZCosIHZvaWQqLCBKU0RP TVdyYXBwZXIqKSB7IHJldHVybiBmYWxzZTsgfQotICAgIGlubGluZSBib29sIGNsZWFySW5saW5l Q2FjaGVkV3JhcHBlcihET01XcmFwcGVyV29ybGQqLCB2b2lkKiwgSlNET01XcmFwcGVyKikgeyBy ZXR1cm4gZmFsc2U7IH0KKyAgICBpbmxpbmUgYm9vbCBzZXRJbmxpbmVDYWNoZWRXcmFwcGVyKERP TVdyYXBwZXJXb3JsZCosIHZvaWQqLCBKU0M6OkpTT2JqZWN0KikgeyByZXR1cm4gZmFsc2U7IH0K KyAgICBpbmxpbmUgYm9vbCBjbGVhcklubGluZUNhY2hlZFdyYXBwZXIoRE9NV3JhcHBlcldvcmxk Kiwgdm9pZCosIEpTQzo6SlNPYmplY3QqKSB7IHJldHVybiBmYWxzZTsgfQogCi0gICAgdGVtcGxh dGUgPHR5cGVuYW1lIERPTUNsYXNzPiBpbmxpbmUgSlNET01XcmFwcGVyKiBnZXRDYWNoZWRXcmFw cGVyKERPTVdyYXBwZXJXb3JsZCogd29ybGQsIERPTUNsYXNzKiBkb21PYmplY3QpCisgICAgdGVt cGxhdGUgPHR5cGVuYW1lIERPTUNsYXNzPiBpbmxpbmUgSlNDOjpKU09iamVjdCogZ2V0Q2FjaGVk V3JhcHBlcihET01XcmFwcGVyV29ybGQqIHdvcmxkLCBET01DbGFzcyogZG9tT2JqZWN0KQogICAg IHsKICAgICAgICAgaWYgKEpTRE9NV3JhcHBlciogd3JhcHBlciA9IGdldElubGluZUNhY2hlZFdy YXBwZXIod29ybGQsIGRvbU9iamVjdCkpCiAgICAgICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAg ICAgICAgcmV0dXJuIHdvcmxkLT5tX3dyYXBwZXJzLmdldChkb21PYmplY3QpLmdldCgpOwogICAg IH0KIAotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBET01DbGFzcz4gaW5saW5lIHZvaWQgY2FjaGVX cmFwcGVyKERPTVdyYXBwZXJXb3JsZCogd29ybGQsIERPTUNsYXNzKiBkb21PYmplY3QsIEpTRE9N V3JhcHBlciogd3JhcHBlcikKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgRE9NQ2xhc3M+IGlubGlu ZSB2b2lkIGNhY2hlV3JhcHBlcihET01XcmFwcGVyV29ybGQqIHdvcmxkLCBET01DbGFzcyogZG9t T2JqZWN0LCBKU0M6OkpTT2JqZWN0KiB3cmFwcGVyKQogICAgIHsKICAgICAgICAgaWYgKHNldElu bGluZUNhY2hlZFdyYXBwZXIod29ybGQsIGRvbU9iamVjdCwgd3JhcHBlcikpCiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIEFTU0VSVCghd29ybGQtPm1fd3JhcHBlcnMuY29udGFpbnMoZG9t T2JqZWN0KSk7Ci0gICAgICAgIHdvcmxkLT5tX3dyYXBwZXJzLnNldChkb21PYmplY3QsIEpTQzo6 V2VhazxKU0RPTVdyYXBwZXI+KCp3b3JsZC0+Z2xvYmFsRGF0YSgpLCB3cmFwcGVyLCB3cmFwcGVy T3duZXIod29ybGQsIGRvbU9iamVjdCksIHdyYXBwZXJDb250ZXh0KHdvcmxkLCBkb21PYmplY3Qp KSk7CisgICAgICAgIHdvcmxkLT5tX3dyYXBwZXJzLnNldChkb21PYmplY3QsIEpTQzo6V2VhazxK U0M6OkpTT2JqZWN0Pigqd29ybGQtPmdsb2JhbERhdGEoKSwgd3JhcHBlciwgd3JhcHBlck93bmVy KHdvcmxkLCBkb21PYmplY3QpLCB3cmFwcGVyQ29udGV4dCh3b3JsZCwgZG9tT2JqZWN0KSkpOwog ICAgIH0KIAogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBET01DbGFzcz4gaW5saW5lIHZvaWQgdW5j YWNoZVdyYXBwZXIoRE9NV3JhcHBlcldvcmxkKiB3b3JsZCwgRE9NQ2xhc3MqIGRvbU9iamVjdCwg SlNET01XcmFwcGVyKiB3cmFwcGVyKQpAQCAtMTY2LDcgKzE2Niw3IEBAIGVudW0gUGFyYW1ldGVy TWlzc2luZ1BvbGljeSB7CiAgICAgewogICAgICAgICBpZiAoIWRvbU9iamVjdCkKICAgICAgICAg ICAgIHJldHVybiBKU0M6OmpzTnVsbCgpOwotICAgICAgICBpZiAoSlNET01XcmFwcGVyKiB3cmFw cGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGRvbU9iamVjdCkpCisg ICAgICAgIGlmIChKU0M6OkpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJy ZW50V29ybGQoZXhlYyksIGRvbU9iamVjdCkpCiAgICAgICAgICAgICByZXR1cm4gd3JhcHBlcjsK ICAgICAgICAgcmV0dXJuIGNyZWF0ZVdyYXBwZXI8V3JhcHBlckNsYXNzPihleGVjLCBnbG9iYWxP YmplY3QsIGRvbU9iamVjdCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNET01XaW5kb3dDdXN0b20uY3BwCmluZGV4IGJhYmQyMWZjYzllZDNjOGE5MGRkZWZkNTEy ZDBhNDFkMTU0OWViNDEuLjhkNTIwZjVmMWI0ZGYxNjI0ZGJhYzk2MTI0M2VmZGNhMTdmMTc0Njcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5j cHAKQEAgLTQyNCw3ICs0MjQsNyBAQCBib29sIEpTRE9NV2luZG93OjpkZWZpbmVPd25Qcm9wZXJ0 eShKU0M6OkpTT2JqZWN0KiBvYmplY3QsIEpTQzo6RXhlY1N0YXRlKiBleGVjLAogSlNWYWx1ZSBK U0RPTVdpbmRvdzo6aGlzdG9yeShFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiB7CiAgICAgSGlzdG9y eSogaGlzdG9yeSA9IGltcGwoKS0+aGlzdG9yeSgpOwotICAgIGlmIChKU0RPTVdyYXBwZXIqIHdy YXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgaGlzdG9yeSkpCisg ICAgaWYgKEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQo ZXhlYyksIGhpc3RvcnkpKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIAogICAgIEpTRE9NV2lu ZG93KiB3aW5kb3cgPSBjb25zdF9jYXN0PEpTRE9NV2luZG93Kj4odGhpcyk7CkBAIC00MzYsNyAr NDM2LDcgQEAgSlNWYWx1ZSBKU0RPTVdpbmRvdzo6aGlzdG9yeShFeGVjU3RhdGUqIGV4ZWMpIGNv bnN0CiBKU1ZhbHVlIEpTRE9NV2luZG93Ojpsb2NhdGlvbihFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0 CiB7CiAgICAgTG9jYXRpb24qIGxvY2F0aW9uID0gaW1wbCgpLT5sb2NhdGlvbigpOwotICAgIGlm IChKU0RPTVdyYXBwZXIqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChl eGVjKSwgbG9jYXRpb24pKQorICAgIGlmIChKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdy YXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBsb2NhdGlvbikpCiAgICAgICAgIHJldHVybiB3cmFw cGVyOwogCiAgICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IGNvbnN0X2Nhc3Q8SlNET01XaW5kb3cq Pih0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRG9jdW1l bnRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3Rv bS5jcHAKaW5kZXggNWZhYTM0MDhkNzcwMGNiMThjYzMzYjYwMjYxZjczMzIwYTQ5ODIxNC4uY2Ex NDVlNTZiYjkxZTU3ZGRlNmQwNjRmMmQ5YjBmZjc5MzM2MmNlNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAKQEAgLTU1LDcgKzU1LDcgQEAg SlNWYWx1ZSBKU0RvY3VtZW50Ojpsb2NhdGlvbihFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiAgICAg ICAgIHJldHVybiBqc051bGwoKTsKIAogICAgIExvY2F0aW9uKiBsb2NhdGlvbiA9IGZyYW1lLT5k b21XaW5kb3coKS0+bG9jYXRpb24oKTsKLSAgICBpZiAoSlNET01XcmFwcGVyKiB3cmFwcGVyID0g Z2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGxvY2F0aW9uKSkKKyAgICBpZiAo SlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwg bG9jYXRpb24pKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIAogICAgIEpTTG9jYXRpb24qIGpz TG9jYXRpb24gPSBKU0xvY2F0aW9uOjpjcmVhdGUoZ2V0RE9NU3RydWN0dXJlPEpTTG9jYXRpb24+ KGV4ZWMsIGdsb2JhbE9iamVjdCgpKSwgZ2xvYmFsT2JqZWN0KCksIGxvY2F0aW9uKTsKQEAgLTg4 LDcgKzg4LDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgRG9jdW1lbnQqIGRvY3VtZW4KICAgICBpZiAoIWRvY3VtZW50KQog ICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAKLSAgICBKU0RPTVdyYXBwZXIqIHdyYXBwZXIgPSBn ZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgZG9jdW1lbnQpOworICAgIEpTT2Jq ZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGRvY3Vt ZW50KTsKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRDdXN0b20uY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHAKaW5kZXggYjg5MWY4OTM4 NmQ1ZDYwZTMyNTU2YTUyZTcxYWE4M2YxOGMyYjljOC4uMzUwNjJiZDg2YTBhMDcxYzAxMjAxY2U5 Yjk0Y2ZkNmZmZDMyMGU4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNFdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVu dEN1c3RvbS5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhl YywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgRXZlbnQqIGV2ZW50KQogICAgIGlm ICghZXZlbnQpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAgIEpTRE9NV3JhcHBlciog d3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBldmVudCk7Cisg ICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVj KSwgZXZlbnQpOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MQ29sbGVjdGlvbkN1 c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3Vz dG9tLmNwcAppbmRleCA1YjlhOGUxZGZmZWVmNDI3NmMyZmVjNzI5ZDc3Y2VlMzJjZGFjZWUyLi4w ZWY4MDk5NzIyMDk1M2ZiMDYzOTU5ZmNlYTY1NTdhNTliNGY0MTU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcApAQCAt OTAsNyArOTAsNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBIVE1MQ29sbGVjdGlvbiogYwogICAgIGlmICghY29sbGVjdGlv bikKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNET01XcmFwcGVyKiB3cmFwcGVy ID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGNvbGxlY3Rpb24pOworICAg IEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyks IGNvbGxlY3Rpb24pOwogCiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFnZURhdGFDdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFnZURhdGFDdXN0b20uY3Bw CmluZGV4IDBmODllOTA1OWFhZWI1NmQ5YzEwMjAyODgzYWM5MDE4MzNhZTc5Y2IuLjljYzllOWNh ZGIwZmQwZjgzMmQwYTQ3OGRiOWEyYjM0ZjYxYzMyNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTSW1hZ2VEYXRhQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1c3RvbS5jcHAKQEAgLTQxLDcgKzQxLDcgQEAgSlNW YWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCwgSW1hZ2VEYXRhKiBpbWFnZUQKICAgICBpZiAoIWltYWdlRGF0YSkKICAgICAgICAgcmV0dXJu IGpzTnVsbCgpOwogICAgIAotICAgIEpTRE9NV3JhcHBlciogd3JhcHBlciA9IGdldENhY2hlZFdy YXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBpbWFnZURhdGEpOworICAgIEpTT2JqZWN0KiB3cmFw cGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGltYWdlRGF0YSk7CiAg ICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogICAgIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9tLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU1ZHUGF0aFNlZ0N1c3RvbS5jcHAKaW5kZXggM2Fk YWJhZjcxMzA5MzgyMDU1YjU5YzYyMTUzYTRhODBkMDI1YzY5Zi4uOGFkYmYxYzZjYjM3OTNjZjcy ZjcyNjA3NmEwYjQ1YmJiZDQzNjc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU1NWR1BhdGhTZWdDdXN0b20uY3BwCkBAIC02Myw3ICs2Myw3IEBAIEpTVmFsdWUgdG9K UyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFNWR1Bh dGhTZWcqIG9iamVjCiAgICAgaWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsK IAotICAgIGlmIChKU0RPTVdyYXBwZXIqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJl bnRXb3JsZChleGVjKSwgb2JqZWN0KSkKKyAgICBpZiAoSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRD YWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgb2JqZWN0KSkKICAgICAgICAgcmV0dXJu IHdyYXBwZXI7CiAKICAgICBzd2l0Y2ggKG9iamVjdC0+cGF0aFNlZ1R5cGUoKSkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU3R5bGVTaGVldEN1c3RvbS5jcHAKaW5kZXgg NDhlM2QwZDFhMGQ5MjlkYzJkZTExZWU0YTVhNzEwN2YyY2U1ZDEzNS4uYjA3MTEyYzgxMmEyODAx YWZiYzdjYjBmOTIyNDljODQxNDg3OWE0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU1N0eWxlU2hlZXRDdXN0b20uY3BwCkBAIC01MCw3ICs1MCw3IEBAIEpTVmFsdWUg dG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFN0 eWxlU2hlZXQqIHN0eWxlCiAgICAgaWYgKCFzdHlsZVNoZWV0KQogICAgICAgICByZXR1cm4ganNO dWxsKCk7CiAKLSAgICBKU0RPTVdyYXBwZXIqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1 cnJlbnRXb3JsZChleGVjKSwgc3R5bGVTaGVldCk7CisgICAgSlNPYmplY3QqIHdyYXBwZXIgPSBn ZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgc3R5bGVTaGVldCk7CiAgICAgaWYg KHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNrQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTVHJhY2tDdXN0b20uY3BwCmluZGV4IDFkOWNhMDAwZTcwYTZhYzU3YTkzYTU1 NWIyOWNjYTNiMzEwZmM5ODQuLjUxN2QxYTVlZjA1MTMwOWFmMzYxODQzZDFhZmNjMDMzOWJiODI1 MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTVHJhY2tDdXN0b20u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTVHJhY2tDdXN0b20uY3BwCkBA IC01NSw3ICs1NSw3IEBAIEpTQzo6SlNWYWx1ZSB0b0pTKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBK U0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBUcmFja0JhCiAgICAgaWYgKCF0cmFjaykK ICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgIAotICAgIEpTRE9NV3JhcHBlciogd3JhcHBl ciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCB0cmFjayk7CisgICAgSlNP YmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgdHJh Y2spOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAgICAK