53785 2011-02-04 10:17:23 -0800 WebKit2: Pages with dynamically inserted iframes can add extraneous back/forward items. 2011-02-04 12:39:03 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson darin oldest_to_newest 345580 0 beidson 2011-02-04 10:17:23 -0800 WebKit2: Pages with dynamically inserted iframes can add extraneous back/forward items. First noticed at http://www.cnn.com/ with dynamically appended iframes related to facebook. Turns out this is because the "decidePolicyForNavigationAction" policy delegate is asynchronous, and WebCore can't handle that too well. The answer to that policy delegate is what sets up the provisional DocumentLoader in the FrameLoader, and if it's not synchronous, the FrameLoader can't tell the DocumentLoader "this is a quick redirect - you shouldn't add a back/forward history item" Making the delegate call synchronous is the cleanest way to fix this for now. LayoutTest will be included in the upcoming patch. In radar as <rdar://problem/8636239> 345685 1 81263 beidson 2011-02-04 12:24:42 -0800 Created attachment 81263 Patch + layout test (v1) 345699 2 beidson 2011-02-04 12:39:03 -0800 http://trac.webkit.org/changeset/77657 81263 2011-02-04 12:24:42 -0800 2011-02-04 12:35:42 -0800 Patch + layout test (v1) patch.txt text/plain 12370 beidson SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NjUyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDItMDQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NjM2MjM5PiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNzg1CisgICAgICAgIFdlYktpdDI6IFBh Z2VzIHdpdGggZHluYW1pY2FsbHkgaW5zZXJ0ZWQgaWZyYW1lcyBjYW4gYWRkIGV4dHJhbmVvdXMg YmFjay9mb3J3YXJkIGl0ZW1zLgorCisgICAgICAgIFdlYkNvcmUgZG9lc24ndCBncmFjZWZ1bGx5 IGhhbmRsZSB0aGUgY2FzZSB3aGVyZSB0aGUgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv biBjYWxsYmFjaworICAgICAgICBkb2VzIG5vdCBvY2N1ciBzeW5jaHJvbm91c2x5LiBMZXQncyBt YWtlIGl0IHN5bmNocm9ub3VzLgorCisgICAgICAgIENoYW5nZSBXZWJQYWdlUHJveHkgdG8gaGFu ZGxlIHRoaXMgbWVzc2FnZSByZXBseSBzeW5jaHJvbm91c2x5OgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBh Z2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lE ZWNpc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46IE1ha2UgdGhlIG5h dmlnYXRpb24gcG9saWN5IGFjdGlvbiBtZXNzYWdlIGJlIHN5bmNocm9ub3VzLgorCisgICAgICAg ICogUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmg6CisgICAgICAgIChDb3JlSVBDOjpj YWxsTWVtYmVyRnVuY3Rpb24pOiBBZGQgYSA2LWFyZ3VtZW50IHZhcmllbnQgCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbik6IFNlbmQgdGhlIG1lc3NhZ2Ugc3luY2hyb25vdXNseS4KKwog MjAxMS0wMi0wNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAkocmV2aXNpb24gNzc2MzUpCisrKyBT b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtMTU5LDYgKzE1OSwxMSBAQCB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihjb25zdCBB cmd1bWVudHM1CiAgICAgKG9iamVjdC0+KmZ1bmN0aW9uKShhcmdzLmFyZ3VtZW50MSwgYXJncy5h cmd1bWVudDIsIGFyZ3MuYXJndW1lbnQzLCBhcmdzLmFyZ3VtZW50NCwgYXJncy5hcmd1bWVudDUs IHJlcGx5QXJncy5hcmd1bWVudDEsIHJlcGx5QXJncy5hcmd1bWVudDIpOwogfQogCit0ZW1wbGF0 ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAyLCB0eXBl bmFtZSBQMywgdHlwZW5hbWUgUDQsIHR5cGVuYW1lIFA1LCB0eXBlbmFtZSBQNiwgdHlwZW5hbWUg UjEsIHR5cGVuYW1lIFIyPgordm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRz NjxQMSwgUDIsIFAzLCBQNCwgUDUsIFA2PiYgYXJncywgQXJndW1lbnRzMjxSMSwgUjI+JiByZXBs eUFyZ3MsIEMqIG9iamVjdCwgTUYgZnVuY3Rpb24pCit7CisgICAgKG9iamVjdC0+KmZ1bmN0aW9u KShhcmdzLmFyZ3VtZW50MSwgYXJncy5hcmd1bWVudDIsIGFyZ3MuYXJndW1lbnQzLCBhcmdzLmFy Z3VtZW50NCwgYXJncy5hcmd1bWVudDUsIGFyZ3MuYXJndW1lbnQ2LCByZXBseUFyZ3MuYXJndW1l bnQxLCByZXBseUFyZ3MuYXJndW1lbnQyKTsKK30KICAgICAKIHRlbXBsYXRlPHR5cGVuYW1lIEMs IHR5cGVuYW1lIE1GLCB0eXBlbmFtZSBQMSwgdHlwZW5hbWUgUDIsIHR5cGVuYW1lIFAzLCB0eXBl bmFtZSBQNCwgdHlwZW5hbWUgUjEsIHR5cGVuYW1lIFIyLCB0eXBlbmFtZSBSMz4KIHZvaWQgY2Fs bE1lbWJlckZ1bmN0aW9uKGNvbnN0IEFyZ3VtZW50czQ8UDEsIFAyLCBQMywgUDQ+JiBhcmdzLCBB cmd1bWVudHMzPFIxLCBSMiwgUjM+JiByZXBseUFyZ3MsIEMqIG9iamVjdCwgTUYgZnVuY3Rpb24p CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNp b24gNzc2MzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE4LDYgKzExOCw5IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVBy b3h5KFBhZ2VDbGllbnQqIHAKICAgICAsIG1fc3luY01pbWVUeXBlUG9saWN5QWN0aW9uSXNWYWxp ZChmYWxzZSkKICAgICAsIG1fc3luY01pbWVUeXBlUG9saWN5QWN0aW9uKFBvbGljeVVzZSkKICAg ICAsIG1fc3luY01pbWVUeXBlUG9saWN5RG93bmxvYWRJRCgwKQorICAgICwgbV9pbkRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oZmFsc2UpCisgICAgLCBtX3N5bmNOYXZpZ2F0aW9uQWN0 aW9uUG9saWN5QWN0aW9uSXNWYWxpZChmYWxzZSkKKyAgICAsIG1fc3luY05hdmlnYXRpb25BY3Rp b25Qb2xpY3lBY3Rpb24oUG9saWN5VXNlKQogICAgICwgbV9wcm9jZXNzaW5nV2hlZWxFdmVudChm YWxzZSkKICAgICAsIG1fcHJvY2Vzc2luZ01vdXNlTW92ZUV2ZW50KGZhbHNlKQogICAgICwgbV9w YWdlSUQocGFnZUlEKQpAQCAtNzcxLDYgKzc3NCwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVj ZWl2ZWRQb2xpY3lEZWNpc2lvCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICAvLyBJZiB3 ZSByZWNlaXZlZCBhIHBvbGljeSBkZWNpc2lvbiB3aGlsZSBpbiBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uIHRoZSBkZWNpc2lvbiB3aWxsIAorICAgIC8vIGJlIHNlbnQgYmFjayB0byB0 aGUgd2ViIHByb2Nlc3MgYnkgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbi4gCisgICAg aWYgKG1faW5EZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKSB7CisgICAgICAgIG1fc3lu Y05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBY3Rpb25Jc1ZhbGlkID0gdHJ1ZTsKKyAgICAgICAgbV9z eW5jTmF2aWdhdGlvbkFjdGlvblBvbGljeUFjdGlvbiA9IGFjdGlvbjsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKyAgICAKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRp ZFJlY2VpdmVQb2xpY3lEZWNpc2lvbihmcmFtZS0+ZnJhbWVJRCgpLCBsaXN0ZW5lcklELCBhY3Rp b24sIGRvd25sb2FkSUQpLCBtX3BhZ2VJRCk7CiB9CiAKQEAgLTE0NTUsOCArMTQ2Niw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpmcmFtZURpZEJlY29tZUZyYW1lU2UKIH0KIAogLy8gUG9saWN5Q2xp ZW50Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQzMl90IG9wYXF1ZU5hdmlnYXRpb25UeXBlLCB1aW50MzJf dCBvcGFxdWVNb2RpZmllcnMsIGludDMyX3Qgb3BhcXVlTW91c2VCdXR0b24sIGNvbnN0IFN0cmlu ZyYgdXJsLCB1aW50NjRfdCBsaXN0ZW5lcklEKQordm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3Qgb3BhcXVl TmF2aWdhdGlvblR5cGUsIHVpbnQzMl90IG9wYXF1ZU1vZGlmaWVycywgaW50MzJfdCBvcGFxdWVN b3VzZUJ1dHRvbiwgY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQsIGJvb2wm IHJlY2VpdmVkUG9saWN5QWN0aW9uLCB1aW50NjRfdCYgcG9saWN5QWN0aW9uKQogewogICAgIGlm ICh1cmwgIT0gcGVuZGluZ0FQSVJlcXVlc3RVUkwoKSkKICAgICAgICAgY2xlYXJQZW5kaW5nQVBJ UmVxdWVzdFVSTCgpOwpAQCAtMTQ2OSw4ICsxNDc5LDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2EKICAgICBXZWJNb3VzZUV2ZW50OjpCdXR0b24gbW91c2VCdXR0 b24gPSBzdGF0aWNfY2FzdDxXZWJNb3VzZUV2ZW50OjpCdXR0b24+KG9wYXF1ZU1vdXNlQnV0dG9u KTsKICAgICAKICAgICBSZWZQdHI8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiBsaXN0ZW5l ciA9IGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkobGlzdGVuZXJJRCk7CisKKyAgICBB U1NFUlQoIW1faW5EZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKTsKKworICAgIG1faW5E ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gdHJ1ZTsKKyAgICBtX3N5bmNOYXZpZ2F0 aW9uQWN0aW9uUG9saWN5QWN0aW9uSXNWYWxpZCA9IGZhbHNlOworICAgIAogICAgIGlmICghbV9w b2xpY3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0aGlzLCBuYXZpZ2F0 aW9uVHlwZSwgbW9kaWZpZXJzLCBtb3VzZUJ1dHRvbiwgdXJsLCBmcmFtZSwgbGlzdGVuZXIuZ2V0 KCkpKQogICAgICAgICBsaXN0ZW5lci0+dXNlKCk7CisKKyAgICBtX2luRGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbiA9IGZhbHNlOworCisgICAgLy8gQ2hlY2sgaWYgd2UgcmVjZWl2ZWQg YSBwb2xpY3kgZGVjaXNpb24gYWxyZWFkeS4gSWYgd2UgZGlkLCB3ZSBjYW4ganVzdCBwYXNzIGl0 IGJhY2suCisgICAgaWYgKG1fc3luY05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBY3Rpb25Jc1ZhbGlk KSB7CisgICAgICAgIHJlY2VpdmVkUG9saWN5QWN0aW9uID0gdHJ1ZTsKKyAgICAgICAgcG9saWN5 QWN0aW9uID0gbV9zeW5jTmF2aWdhdGlvbkFjdGlvblBvbGljeUFjdGlvbjsKKyAgICB9CiB9CiAK IHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0 X3QgZnJhbWVJRCwgdWludDMyX3Qgb3BhcXVlTmF2aWdhdGlvblR5cGUsIHVpbnQzMl90IG9wYXF1 ZU1vZGlmaWVycywgaW50MzJfdCBvcGFxdWVNb3VzZUJ1dHRvbiwgY29uc3QgU3RyaW5nJiB1cmws IHVpbnQ2NF90IGxpc3RlbmVySUQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCShyZXZpc2lvbiA3NzYzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDI0LDcgKzQyNCw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBkaWRGaW5pc2hQcm9ncmVzcygpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUFjY2Vz c2liaWxpdHlQYWdlVG9rZW4oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpOwogICAgIAot ICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih1aW50NjRfdCBmcmFtZUlE LCB1aW50MzJfdCBuYXZpZ2F0aW9uVHlwZSwgdWludDMyX3QgbW9kaWZpZXJzLCBpbnQzMl90IG1v dXNlQnV0dG9uLCBjb25zdCBTdHJpbmcmIHVybCwgdWludDY0X3QgbGlzdGVuZXJJRCk7CisgICAg dm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQzMl90IG5hdmlnYXRpb25UeXBlLCB1aW50MzJfdCBtb2RpZmllcnMsIGludDMyX3QgbW91c2VC dXR0b24sIGNvbnN0IFN0cmluZyYgdXJsLCB1aW50NjRfdCBsaXN0ZW5lcklELCBib29sJiByZWNl aXZlZFBvbGljeUFjdGlvbiwgdWludDY0X3QmIHBvbGljeUFjdGlvbik7CiAgICAgdm9pZCBkZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3QgbmF2 aWdhdGlvblR5cGUsIHVpbnQzMl90IG1vZGlmaWVycywgaW50MzJfdCBtb3VzZUJ1dHRvbiwgY29u c3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQpOwogICAgIHZvaWQgZGVjaWRlUG9s aWN5Rm9yTUlNRVR5cGUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwg Y29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQsIGJvb2wmIHJlY2VpdmVkUG9s aWN5QWN0aW9uLCB1aW50NjRfdCYgcG9saWN5QWN0aW9uLCB1aW50NjRfdCYgZG93bmxvYWRJRCk7 CiAKQEAgLTY0Miw2ICs2NDIsMTAgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpQb2xpY3lBY3Rp b24gbV9zeW5jTWltZVR5cGVQb2xpY3lBY3Rpb247CiAgICAgdWludDY0X3QgbV9zeW5jTWltZVR5 cGVQb2xpY3lEb3dubG9hZElEOwogCisgICAgYm9vbCBtX2luRGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbjsKKyAgICBib29sIG1fc3luY05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBY3Rpb25J c1ZhbGlkOworICAgIFdlYkNvcmU6OlBvbGljeUFjdGlvbiBtX3N5bmNOYXZpZ2F0aW9uQWN0aW9u UG9saWN5QWN0aW9uOworICAgIAogICAgIERlcXVlPE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ+IG1f a2V5RXZlbnRRdWV1ZTsKICAgICBib29sIG1fcHJvY2Vzc2luZ1doZWVsRXZlbnQ7CiAgICAgT3du UHRyPFdlYldoZWVsRXZlbnQ+IG1fbmV4dFdoZWVsRXZlbnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDc3 NjM1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5p bgkod29ya2luZyBjb3B5KQpAQCAtNjcsNyArNjcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJv eHkgewogCiAgICAgIyBQb2xpY3kgbWVzc2FnZXMKICAgICBEZWNpZGVQb2xpY3lGb3JNSU1FVHlw ZSh1aW50NjRfdCBmcmFtZUlELCBXVEY6OlN0cmluZyBNSU1FVHlwZSwgV1RGOjpTdHJpbmcgdXJs LCB1aW50NjRfdCBsaXN0ZW5lcklEKSAtPiAoYm9vbCByZWNlaXZlZFBvbGljeUFjdGlvbiwgdWlu dDY0X3QgcG9saWN5QWN0aW9uLCB1aW50NjRfdCBkb3dubG9hZElEKQotICAgIERlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3QgbmF2aWdhdGlv blR5cGUsIHVpbnQzMl90IG1vZGlmaWVycywgaW50MzJfdCBtb3VzZUJ1dHRvbiwgV1RGOjpTdHJp bmcgdXJsLCB1aW50NjRfdCBsaXN0ZW5lcklEKQorICAgIERlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwgdWludDMyX3QgbmF2aWdhdGlvblR5cGUsIHVpbnQz Ml90IG1vZGlmaWVycywgaW50MzJfdCBtb3VzZUJ1dHRvbiwgV1RGOjpTdHJpbmcgdXJsLCB1aW50 NjRfdCBsaXN0ZW5lcklEKSAtPiAoYm9vbCByZWNlaXZlZFBvbGljeUFjdGlvbiwgdWludDY0X3Qg cG9saWN5QWN0aW9uKQogICAgIERlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRf dCBmcmFtZUlELCB1aW50MzJfdCBuYXZpZ2F0aW9uVHlwZSwgdWludDMyX3QgbW9kaWZpZXJzLCBp bnQzMl90IG1vdXNlQnV0dG9uLCBXVEY6OlN0cmluZyB1cmwsIHVpbnQ2NF90IGxpc3RlbmVySUQp CiAKICAgICAjIFByb2dyZXNzIG1lc3NhZ2VzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcAkocmV2aXNpb24gNzc2MzUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjc5LDggKzY3OSwxNSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERl Y2lkCiAgICAgdWludDMyX3QgbmF2aWdhdGlvblR5cGUgPSBzdGF0aWNfY2FzdDx1aW50MzJfdD4o bmF2aWdhdGlvbkFjdGlvbi50eXBlKCkpOwogICAgIHVpbnQzMl90IG1vZGlmaWVycyA9IG1vZGlm aWVyc0Zvck5hdmlnYXRpb25BY3Rpb24obmF2aWdhdGlvbkFjdGlvbik7CiAgICAgaW50MzJfdCBt b3VzZUJ1dHRvbiA9IG1vdXNlQnV0dG9uRm9yTmF2aWdhdGlvbkFjdGlvbihuYXZpZ2F0aW9uQWN0 aW9uKTsKKyAgICAKKyAgICBib29sIHJlY2VpdmVkUG9saWN5QWN0aW9uOworICAgIHVpbnQ2NF90 IHBvbGljeUFjdGlvbjsKKyAgICBpZiAoIXdlYlBhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24obV9mcmFtZS0+ZnJhbWVJ RCgpLCBuYXZpZ2F0aW9uVHlwZSwgbW9kaWZpZXJzLCBtb3VzZUJ1dHRvbiwgdXJsLCBsaXN0ZW5l cklEKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbjo6UmVwbHkocmVjZWl2ZWRQb2xpY3lBY3Rpb24sIHBvbGljeUFjdGlvbikpKQorICAgICAg ICByZXR1cm47CiAKLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24obV9mcmFtZS0+ZnJhbWVJRCgpLCBuYXZpZ2F0 aW9uVHlwZSwgbW9kaWZpZXJzLCBtb3VzZUJ1dHRvbiwgdXJsLCBsaXN0ZW5lcklEKSk7CisgICAg Ly8gV2UgY2FsbCB0aGlzIHN5bmNocm9ub3VzbHkgYmVjYXVzZSBXZWJDb3JlIGNhbm5vdCBncmFj ZWZ1bGx5IGhhbmRsZSBhIGZyYW1lIGxvYWQgd2l0aG91dCBhIHN5bmNocm9ub3VzIG5hdmlnYXRp b24gcG9saWN5IHJlcGx5LgorICAgIGlmIChyZWNlaXZlZFBvbGljeUFjdGlvbikKKyAgICAgICAg bV9mcmFtZS0+ZGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGxpc3RlbmVySUQsIHN0YXRpY19jYXN0 PFBvbGljeUFjdGlvbj4ocG9saWN5QWN0aW9uKSwgMCk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmNhbmNlbFBvbGljeUNoZWNrKCkKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NjUyKQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTEtMDItMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84 NjM2MjM5PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNzg1 CisgICAgICAgIFdlYktpdDI6IFBhZ2VzIHdpdGggZHluYW1pY2FsbHkgaW5zZXJ0ZWQgaWZyYW1l cyBjYW4gYWRkIGV4dHJhbmVvdXMgYmFjay9mb3J3YXJkIGl0ZW1zLgorCisgICAgICAgICogZmFz dC9sb2FkZXIvZHluYW1pYy1pZnJhbWUtZXh0cmEtYmFjay1mb3J3YXJkLWl0ZW0tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9keW5hbWljLWlmcmFtZS1leHRyYS1i YWNrLWZvcndhcmQtaXRlbS5odG1sOiBBZGRlZC4KKwogMjAxMS0wMi0wNCAgRGltaXRyaSBHbGF6 a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQWRkIGJh c2VsaW5lcyBmb3IgdGVzdHMsIGFkZGVkIGluIHI3NzY0NC4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvbG9hZGVyL2R5bmFtaWMtaWZyYW1lLWV4dHJhLWJhY2stZm9yd2FyZC1pdGVtLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9keW5hbWljLWlmcmFt ZS1leHRyYS1iYWNrLWZvcndhcmQtaXRlbS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L2xvYWRlci9keW5hbWljLWlmcmFtZS1leHRyYS1iYWNrLWZvcndhcmQt aXRlbS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsOCBAQAorPHJkYXI6Ly9w cm9ibGVtLzg2MzYyMzk+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTM3ODUgLSBFeHRyYW5lb3VzIGJhY2svZm9yd2FyZCBlbnRyaWVzIHdpdGggZHluYW1pY2Fs bHkgYXBwZW5kZWQgaWZyYW1lcy4KK1RoaXMgcGFnZSBhcHBlbmRzIGFuIGlmcmFtZSBhZnRlciBv bmxvYWQuIFRoYXQgaWZyYW1lIHNob3VsZCAqbm90KiByZXN1bHQgaW4gYSBuZXcgYmFjay9mb3J3 YXJkIGVudHJ5IGluIHRoZSBzZXNzaW9uIGhpc3RvcnkuCisKKworPT09PT09PT09PT09PT0gQmFj ayBGb3J3YXJkIExpc3QgPT09PT09PT09PT09PT0KK2N1cnItPiAgKGZpbGUgdGVzdCk6ZmFzdC9s b2FkZXIvZHluYW1pYy1pZnJhbWUtZXh0cmEtYmFjay1mb3J3YXJkLWl0ZW0uaHRtbCAgKipuYXYg dGFyZ2V0KioKKyAgICAgICAgICAgIChmaWxlIHRlc3QpOmZhc3QvbG9hZGVyL3Jlc291cmNlcy9u b3RpZnktZG9uZS5odG1sIChpbiBmcmFtZSAiPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTAtLT4t LT4iKQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KSW5k ZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2R5bmFtaWMtaWZyYW1lLWV4dHJhLWJhY2stZm9y d2FyZC1pdGVtLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZHlu YW1pYy1pZnJhbWUtZXh0cmEtYmFjay1mb3J3YXJkLWl0ZW0uaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2R5bmFtaWMtaWZyYW1lLWV4dHJhLWJhY2stZm9yd2Fy ZC1pdGVtLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTggQEAKKzxzY3JpcHQ+CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICBsYXlvdXRUZXN0Q29udHJvbGxlci5k dW1wQXNUZXh0KCk7CisgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQmFja0ZvcndhcmRMaXN0 KCk7CisgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CisKK2Z1bmN0 aW9uIGxvYWRlZCgpCit7CisgICAgdmFyIGYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpZnJh bWUiKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGYpOworICAgIGYuc2V0QXR0cmli dXRlKCdzcmMnLCAncmVzb3VyY2VzL25vdGlmeS1kb25lLmh0bWwnKTsKK30gICAgCis8L3Njcmlw dD4KKzxib2R5IG9ubG9hZD0ic2V0VGltZW91dCgnbG9hZGVkKCknLCAwKTsiPgorJmx0O3JkYXI6 Ly9wcm9ibGVtLzg2MzYyMzkmZ3Q7IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTM3ODUgLSBFeHRyYW5lb3VzIGJhY2svZm9yd2FyZCBlbnRyaWVzIHdpdGggZHlu YW1pY2FsbHkgYXBwZW5kZWQgaWZyYW1lcy48YnI+CitUaGlzIHBhZ2UgYXBwZW5kcyBhbiBpZnJh bWUgYWZ0ZXIgb25sb2FkLiAgVGhhdCBpZnJhbWUgc2hvdWxkICpub3QqIHJlc3VsdCBpbiBhIG5l dyBiYWNrL2ZvcndhcmQgZW50cnkgaW4gdGhlIHNlc3Npb24gaGlzdG9yeS48YnI+Cis8L2JvZHk+ Cg==