101246 2012-11-05 12:35:02 -0800 [BlackBerry] Do not display error page for failed downloads 2012-11-05 14:00:13 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 liachen liachen joenotcharles leoyang mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 758791 0 liachen 2012-11-05 12:35:02 -0800 When a download failed or denied, its failure is shown in DownloadManager, and it should not lead to an error page. 758792 1 liachen 2012-11-05 12:36:21 -0800 +Yong, Rob, Joe, Leo. 758807 2 172383 liachen 2012-11-05 12:51:02 -0800 Created attachment 172383 patch for 101246 758825 3 172389 liachen 2012-11-05 13:26:36 -0800 Created attachment 172389 Upload the correct patch 758839 4 172389 rwlbuis 2012-11-05 13:46:56 -0800 Comment on attachment 172389 Upload the correct patch LGTM 758858 5 172389 webkit.review.bot 2012-11-05 14:00:10 -0800 Comment on attachment 172389 Upload the correct patch Clearing flags on attachment: 172389 Committed r133522: <http://trac.webkit.org/changeset/133522> 758859 6 webkit.review.bot 2012-11-05 14:00:13 -0800 All reviewed patches have been landed. Closing bug. 172383 2012-11-05 12:51:02 -0800 2012-11-05 13:26:36 -0800 patch for 101246 101246.patch text/plain 11706 liachen Y29tbWl0IGJiZmVhYzZjOTRkZjQ1NjM0MjgyMzA1Zjk4YWY0YzBjNGNhNTc4NWMKQXV0aG9yOiBk cHJhbmtlQGNocm9taXVtLm9yZyA8ZHByYW5rZUBjaHJvbWl1bS5vcmdAMjY4ZjQ1Y2MtY2QwOS0w NDEwLWFiM2MtZDUyNjkxYjRkYmZjPgpEYXRlOiAgIE1vbiBOb3YgNSAxOTo0Nzo1NyAyMDEyICsw MDAwCgogICAgd2Via2l0cHk6IGxpbnQsIGNsZWFuIHVwIHJlYmFzZWxpbmUucHkKICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyNDAKICAgIAogICAgUmV2aWV3 ZWQgYnkgT2phbiBWYWZhaS4KICAgIAogICAgTWlzY2VsbGFuZW91cyBjbGVhbnVwIG9mIGxpbnQg ZXJyb3JzIGFuZCB3YXJuaW5ncy4KICAgIAogICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvcmViYXNlbGluZS5weToKICAgIChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQpOgog ICAgKFJlYmFzZWxpbmVUZXN0Ll90ZXN0X3Jvb3QpOgogICAgKE9wdGltaXplQmFzZWxpbmVzLl9v cHRpbWl6ZV9iYXNlbGluZSk6CiAgICAoT3B0aW1pemVCYXNlbGluZXMuZXhlY3V0ZSk6CiAgICAo QW5hbHl6ZUJhc2VsaW5lcy5fX2luaXRfXyk6CiAgICAoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxp bmVDb21tYW5kKToKICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQuX2J1aWxk ZXJzX3RvX2ZldGNoX2Zyb20pOgogICAgKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFu ZC5fZmlsZXNfdG9fYWRkKToKICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQu X3JlYmFzZWxpbmUpOgogICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuX19pbml0X18pOgogICAg KFJlYmFzZWxpbmUuZXhlY3V0ZSk6CiAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5OgogICAgKF9CYXNlVGVzdENhc2Uuc2V0VXApOgogICAg KFRlc3RBbmFseXplQmFzZWxpbmVzLnNldFVwKToKICAgIAogICAgZ2l0LXN2bi1pZDogaHR0cDov L3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDEzMzUxMCAyNjhmNDVjYy1j ZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmRjMWY2My4uMzg0YTUyOCAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEy LTExLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisgICAgICAgIHdl YmtpdHB5OiBsaW50LCBjbGVhbiB1cCByZWJhc2VsaW5lLnB5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyNDAKKworICAgICAgICBSZXZpZXdlZCBi eSBPamFuIFZhZmFpLgorCisgICAgICAgIE1pc2NlbGxhbmVvdXMgY2xlYW51cCBvZiBsaW50IGVy cm9ycyBhbmQgd2FybmluZ3MuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvcmViYXNlbGluZS5weToKKyAgICAgICAgKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFu ZCk6CisgICAgICAgIChSZWJhc2VsaW5lVGVzdC5fdGVzdF9yb290KToKKyAgICAgICAgKE9wdGlt aXplQmFzZWxpbmVzLl9vcHRpbWl6ZV9iYXNlbGluZSk6CisgICAgICAgIChPcHRpbWl6ZUJhc2Vs aW5lcy5leGVjdXRlKToKKyAgICAgICAgKEFuYWx5emVCYXNlbGluZXMuX19pbml0X18pOgorICAg ICAgICAoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKKyAgICAgICAgKEFic3Ry YWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZC5fYnVpbGRlcnNfdG9fZmV0Y2hfZnJvbSk6Cisg ICAgICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQuX2ZpbGVzX3RvX2FkZCk6 CisgICAgICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQuX3JlYmFzZWxpbmUp OgorICAgICAgICAoUmViYXNlbGluZUV4cGVjdGF0aW9ucy5fX2luaXRfXyk6CisgICAgICAgIChS ZWJhc2VsaW5lLmV4ZWN1dGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5OgorICAgICAgICAoX0Jhc2VUZXN0Q2FzZS5zZXRV cCk6CisgICAgICAgIChUZXN0QW5hbHl6ZUJhc2VsaW5lcy5zZXRVcCk6CisKKzIwMTItMTEtMDUg IERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgd2Via2l0LXBh dGNoIG9wdGltaXplLWJhc2VsaW5lcyBzaG91bGQgdGFrZSBhIC0tcGxhdGZvcm0gYXJnCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzYyMwogCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5Cmlu ZGV4IGJiOTVhMjkuLmU1YzNjNDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC0yOSwyNSArMjksMTUgQEAKIGltcG9ydCBq c29uCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9wdHBhcnNlCi1pbXBvcnQgb3MucGF0aAotaW1w b3J0IHJlCi1pbXBvcnQgc2h1dGlsCiBpbXBvcnQgc3lzCi1pbXBvcnQgdXJsbGliCiAKLWltcG9y dCB3ZWJraXRweS5jb21tb24uY29uZmlnLnVybHMgYXMgY29uZmlnX3VybHMKIGZyb20gd2Via2l0 cHkuY29tbW9uLmNoZWNrb3V0LmJhc2VsaW5lb3B0aW1pemVyIGltcG9ydCBCYXNlbGluZU9wdGlt aXplcgotZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmJ1aWxkYm90IGltcG9ydCBCdWlsZEJvdAot ZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmxheW91dHRlc3RyZXN1bHRzIGltcG9ydCBMYXlvdXRU ZXN0UmVzdWx0cwogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQg U2NyaXB0RXJyb3IKLWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBVc2Vy CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy50ZXN0X3Jlc3VsdF93cml0 ZXIgaW1wb3J0IFRlc3RSZXN1bHRXcml0ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1v ZGVscyBpbXBvcnQgdGVzdF9mYWlsdXJlcwotZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9k ZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2V4cGVjdGF0aW9ucyBpbXBvcnQgVGVzdEV4 cGVjdGF0aW9ucywgQkFTRUxJTkVfU1VGRklYX0xJU1QKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLnBvcnQgaW1wb3J0IGJ1aWxkZXJzCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0 IGltcG9ydCBmYWN0b3J5Ci1mcm9tIHdlYmtpdHB5LnRvb2wuZ3JhbW1hciBpbXBvcnQgcGx1cmFs aXplCiBmcm9tIHdlYmtpdHB5LnRvb2wubXVsdGljb21tYW5kdG9vbCBpbXBvcnQgQWJzdHJhY3RE ZWNsYXJhdGl2ZUNvbW1hbmQKIAogCkBAIC02MCw2ICs1MCw4IEBAIGRlZiBfYmFzZWxpbmVfbmFt ZShmcywgdGVzdF9uYW1lLCBzdWZmaXgpOgogCiAKIGNsYXNzIEFic3RyYWN0UmViYXNlbGluaW5n Q29tbWFuZChBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CisgICAgIyBub3Qgb3ZlcnJpZGlu ZyBleGVjdXRlKCkgLSBweWxpbnQ6IGRpc2FibGUtbXNnPVcwMjIzCisKICAgICBtb3ZlX292ZXJ3 cml0dGVuX2Jhc2VsaW5lc19vcHRpb24gPSBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1tb3ZlLW92 ZXJ3cml0dGVuLWJhc2VsaW5lcyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2Us CiAgICAgICAgIGhlbHA9Ik1vdmUgb3ZlcndyaXR0ZW4gYmFzZWxpbmVzIGVsc2V3aGVyZSBpbiB0 aGUgYmFzZWxpbmUgcGF0aC4gVGhpcyBpcyBmb3IgYnJpbmdpbmcgdXAgbmV3IHBvcnRzLiIpCiAK QEAgLTE3MCw3ICsxNjIsNyBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdChBYnN0cmFjdFJlYmFzZWxp bmluZ0NvbW1hbmQpOgogICAgICAgICAgICAgbG9jay5yZWxlYXNlX2xvY2soKQogCiAgICAgZGVm IF90ZXN0X3Jvb3Qoc2VsZiwgdGVzdF9uYW1lKToKLSAgICAgICAgcmV0dXJuIG9zLnBhdGguc3Bs aXRleHQodGVzdF9uYW1lKVswXQorICAgICAgICByZXR1cm4gc2VsZi5fdG9vbC5maWxlc3lzdGVt LnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0KIAogICAgIGRlZiBfZmlsZV9uYW1lX2Zvcl9hY3R1YWxf cmVzdWx0KHNlbGYsIHRlc3RfbmFtZSwgc3VmZml4KToKICAgICAgICAgcmV0dXJuICIlcy1hY3R1 YWwuJXMiICUgKHNlbGYuX3Rlc3Rfcm9vdCh0ZXN0X25hbWUpLCBzdWZmaXgpCkBAIC0yMTAsMTAg KzIwMiwxMCBAQCBjbGFzcyBPcHRpbWl6ZUJhc2VsaW5lcyhBYnN0cmFjdFJlYmFzZWxpbmluZ0Nv bW1hbmQpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgc3VwZXIoT3B0aW1pemVC YXNlbGluZXMsIHNlbGYpLl9faW5pdF9fKG9wdGlvbnM9W3NlbGYuc3VmZml4ZXNfb3B0aW9uXSAr IHNlbGYucGxhdGZvcm1fb3B0aW9ucykKIAotICAgIGRlZiBfb3B0aW1pemVfYmFzZWxpbmUoc2Vs ZiwgdGVzdF9uYW1lKToKKyAgICBkZWYgX29wdGltaXplX2Jhc2VsaW5lKHNlbGYsIG9wdGltaXpl ciwgdGVzdF9uYW1lKToKICAgICAgICAgZm9yIHN1ZmZpeCBpbiBzZWxmLl9iYXNlbGluZV9zdWZm aXhfbGlzdDoKICAgICAgICAgICAgIGJhc2VsaW5lX25hbWUgPSBfYmFzZWxpbmVfbmFtZShzZWxm Ll90b29sLmZpbGVzeXN0ZW0sIHRlc3RfbmFtZSwgc3VmZml4KQotICAgICAgICAgICAgaWYgbm90 IHNlbGYuX2Jhc2VsaW5lX29wdGltaXplci5vcHRpbWl6ZShiYXNlbGluZV9uYW1lKToKKyAgICAg ICAgICAgIGlmIG5vdCBvcHRpbWl6ZXIub3B0aW1pemUoYmFzZWxpbmVfbmFtZSk6CiAgICAgICAg ICAgICAgICAgcHJpbnQgIkhldXJpc3RpY3MgZmFpbGVkIHRvIG9wdGltaXplICVzIiAlIGJhc2Vs aW5lX25hbWUKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgpA QCAtMjIzLDExICsyMTUsMTEgQEAgY2xhc3MgT3B0aW1pemVCYXNlbGluZXMoQWJzdHJhY3RSZWJh c2VsaW5pbmdDb21tYW5kKToKICAgICAgICAgICAgIHByaW50ICJObyBwb3J0IG5hbWVzIG1hdGNo ICclcyciICUgb3B0aW9ucy5wbGF0Zm9ybQogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAg c2VsZi5fYmFzZWxpbmVfb3B0aW1pemVyID0gQmFzZWxpbmVPcHRpbWl6ZXIodG9vbCwgcG9ydF9u YW1lcykKLSAgICAgICAgc2VsZi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldChwb3J0X25h bWVzWzBdKQotICAgICAgICBmb3IgdGVzdF9uYW1lIGluIHNlbGYuX3BvcnQudGVzdHMoYXJncyk6 CisgICAgICAgIG9wdGltaXplciA9IEJhc2VsaW5lT3B0aW1pemVyKHRvb2wsIHBvcnRfbmFtZXMp CisgICAgICAgIHBvcnQgPSB0b29sLnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lc1swXSkKKyAg ICAgICAgZm9yIHRlc3RfbmFtZSBpbiBwb3J0LnRlc3RzKGFyZ3MpOgogICAgICAgICAgICAgX2xv Zy5pbmZvKCJPcHRpbWl6aW5nICVzIiAlIHRlc3RfbmFtZSkKLSAgICAgICAgICAgIHNlbGYuX29w dGltaXplX2Jhc2VsaW5lKHRlc3RfbmFtZSkKKyAgICAgICAgICAgIHNlbGYuX29wdGltaXplX2Jh c2VsaW5lKG9wdGltaXplciwgdGVzdF9uYW1lKQogCiAKIGNsYXNzIEFuYWx5emVCYXNlbGluZXMo QWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKQEAgLTI0MSw2ICsyMzMsOCBAQCBjbGFzcyBB bmFseXplQmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1taXNzaW5nJywgYWN0aW9uPSdzdG9yZV90cnVlJywg ZGVmYXVsdD1GYWxzZSwgaGVscD0nc2hvdyBtaXNzaW5nIGJhc2VsaW5lcyBhcyB3ZWxsJyksCiAg ICAgICAgICAgICBdICsgc2VsZi5wbGF0Zm9ybV9vcHRpb25zKQogICAgICAgICBzZWxmLl9vcHRp bWl6ZXJfY2xhc3MgPSBCYXNlbGluZU9wdGltaXplciAgIyBvdmVycmlkYWJsZSBmb3IgdGVzdGlu ZworICAgICAgICBzZWxmLl9iYXNlbGluZV9vcHRpbWl6ZXIgPSBOb25lCisgICAgICAgIHNlbGYu X3BvcnQgPSBOb25lCiAKICAgICBkZWYgX3dyaXRlKHNlbGYsIG1zZyk6CiAgICAgICAgIHByaW50 IG1zZwpAQCAtMjY5LDYgKzI2Myw3IEBAIGNsYXNzIEFuYWx5emVCYXNlbGluZXMoQWJzdHJhY3RS ZWJhc2VsaW5pbmdDb21tYW5kKToKIAogCiBjbGFzcyBBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGlu ZUNvbW1hbmQoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKKyAgICAjIG5vdCBvdmVycmlk aW5nIGV4ZWN1dGUoKSAtIHB5bGludDogZGlzYWJsZS1tc2c9VzAyMjMKIAogICAgIGRlZiBfcnVu X3dlYmtpdF9wYXRjaChzZWxmLCBhcmdzLCB2ZXJib3NlKToKICAgICAgICAgdHJ5OgpAQCAtMjc5 LDcgKzI3NCw3IEBAIGNsYXNzIEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZChBYnN0 cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQpOgogICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6 CiAgICAgICAgICAgICBfbG9nLmVycm9yKGUpCiAKLSAgICBkZWYgX2J1aWxkZXJzX3RvX2ZldGNo X2Zyb20oc2VsZiwgYnVpbGRlcnMpOgorICAgIGRlZiBfYnVpbGRlcnNfdG9fZmV0Y2hfZnJvbShz ZWxmLCBidWlsZGVyc190b19jaGVjayk6CiAgICAgICAgICMgVGhpcyByb3V0aW5lIHJldHVybnMg dGhlIHN1YnNldCBvZiBidWlsZGVycyB0aGF0IHdpbGwgY292ZXIgYWxsIG9mIHRoZSBiYXNlbGlu ZSBzZWFyY2ggcGF0aHMKICAgICAgICAgIyB1c2VkIGluIHRoZSBpbnB1dCBsaXN0LiBJbiBwYXJ0 aWN1bGFyLCBpZiB0aGUgaW5wdXQgbGlzdCBjb250YWlucyBib3RoIFJlbGVhc2UgYW5kIERlYnVn CiAgICAgICAgICMgdmVyc2lvbnMgb2YgYSBjb25maWd1cmF0aW9uLCB3ZSAqb25seSogcmV0dXJu IHRoZSBSZWxlYXNlIHZlcnNpb24gKHNpbmNlIHdlIGRvbid0IHNhdmUKQEAgLTI4Nyw3ICsyODIs NyBAQCBjbGFzcyBBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQoQWJzdHJhY3RSZWJh c2VsaW5pbmdDb21tYW5kKToKICAgICAgICAgcmVsZWFzZV9idWlsZGVycyA9IHNldCgpCiAgICAg ICAgIGRlYnVnX2J1aWxkZXJzID0gc2V0KCkKICAgICAgICAgYnVpbGRlcnNfdG9fZmFsbGJhY2tf cGF0aHMgPSB7fQotICAgICAgICBmb3IgYnVpbGRlciBpbiBidWlsZGVyczoKKyAgICAgICAgZm9y IGJ1aWxkZXIgaW4gYnVpbGRlcnNfdG9fY2hlY2s6CiAgICAgICAgICAgICBwb3J0ID0gc2VsZi5f dG9vbC5wb3J0X2ZhY3RvcnkuZ2V0X2Zyb21fYnVpbGRlcl9uYW1lKGJ1aWxkZXIpCiAgICAgICAg ICAgICBpZiBwb3J0LnRlc3RfY29uZmlndXJhdGlvbigpLmJ1aWxkX3R5cGUgPT0gJ1JlbGVhc2Un OgogICAgICAgICAgICAgICAgIHJlbGVhc2VfYnVpbGRlcnMuYWRkKGJ1aWxkZXIpCkBAIC0zMjks NyArMzI0LDcgQEAgY2xhc3MgQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKEFic3Ry YWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgICAgICAgICAgICAgIGlmIGxpbmU6CiAg ICAgICAgICAgICAgICAgICAgICAgICBmaWxlc190b19hZGQudXBkYXRlKGpzb24ubG9hZHMobGlu ZSlbJ2FkZCddKQogICAgICAgICAgICAgICAgICAgICAgICAgZmlsZV9hZGRlZCA9IFRydWUKLSAg ICAgICAgICAgICAgICBleGNlcHQgVmFsdWVFcnJvciwgZToKKyAgICAgICAgICAgICAgICBleGNl cHQgVmFsdWVFcnJvcjoKICAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygnIiVzIiBpcyBu b3QgYSBKU09OIG9iamVjdCwgaWdub3JpbmcnICUgbGluZSkKIAogICAgICAgICAgICAgaWYgbm90 IGZpbGVfYWRkZWQ6CkBAIC0zNDgsOSArMzQzLDkgQEAgY2xhc3MgQWJzdHJhY3RQYXJhbGxlbFJl YmFzZWxpbmVDb21tYW5kKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgICAg ICBzZWxmLl9ydW5fd2Via2l0X3BhdGNoKFsnb3B0aW1pemUtYmFzZWxpbmVzJywgJy0tc3VmZml4 ZXMnLCAnLCcuam9pbihhbGxfc3VmZml4ZXMpLCB0ZXN0XSwgdmVyYm9zZSkKIAogICAgIGRlZiBf cmViYXNlbGluZShzZWxmLCBvcHRpb25zLCB0ZXN0X2xpc3QpOgotICAgICAgICBmb3IgdGVzdCwg YnVpbGRlcnMgaW4gc29ydGVkKHRlc3RfbGlzdC5pdGVtcygpKToKKyAgICAgICAgZm9yIHRlc3Qs IGJ1aWxkZXJzX3RvX2NoZWNrIGluIHNvcnRlZCh0ZXN0X2xpc3QuaXRlbXMoKSk6CiAgICAgICAg ICAgICBfbG9nLmluZm8oIlJlYmFzZWxpbmluZyAlcyIgJSB0ZXN0KQotICAgICAgICAgICAgZm9y IGJ1aWxkZXIsIHN1ZmZpeGVzIGluIHNvcnRlZChidWlsZGVycy5pdGVtcygpKToKKyAgICAgICAg ICAgIGZvciBidWlsZGVyLCBzdWZmaXhlcyBpbiBzb3J0ZWQoYnVpbGRlcnNfdG9fY2hlY2suaXRl bXMoKSk6CiAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiICAlczogJXMiICUgKGJ1aWxkZXIs ICIsIi5qb2luKHN1ZmZpeGVzKSkpCiAKICAgICAgICAgY29tbWFuZHMgPSBzZWxmLl9yZWJhc2Vs aW5lX2NvbW1hbmRzKHRlc3RfbGlzdCwgb3B0aW9ucykKQEAgLTM5Myw2ICszODgsNyBAQCBjbGFz cyBSZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFu ZCk6CiAgICAgICAgICAgICBzZWxmLm1vdmVfb3ZlcndyaXR0ZW5fYmFzZWxpbmVzX29wdGlvbiwK ICAgICAgICAgICAgIHNlbGYubm9fb3B0aW1pemVfb3B0aW9uLAogICAgICAgICAgICAgXSArIHNl bGYucGxhdGZvcm1fb3B0aW9ucykKKyAgICAgICAgc2VsZi5fdGVzdF9saXN0ID0gTm9uZQogCiAg ICAgZGVmIF91cGRhdGVfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYsIHBvcnRfbmFtZSk6CiAgICAg ICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lKQpAQCAtNDc5 LDE2ICs0NzUsMTYgQEAgY2xhc3MgUmViYXNlbGluZShBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGlu ZUNvbW1hbmQpOgogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgog ICAgICAgICBvcHRpb25zLnJlc3VsdHNfZGlyZWN0b3J5ID0gTm9uZQogICAgICAgICBpZiBvcHRp b25zLmJ1aWxkZXJzOgotICAgICAgICAgICAgYnVpbGRlcnMgPSBbXQorICAgICAgICAgICAgYnVp bGRlcnNfdG9fY2hlY2sgPSBbXQogICAgICAgICAgICAgZm9yIGJ1aWxkZXJfbmFtZXMgaW4gb3B0 aW9ucy5idWlsZGVyczoKLSAgICAgICAgICAgICAgICBidWlsZGVycyArPSBbc2VsZi5fYnVpbGRl cl93aXRoX25hbWUobmFtZSkgZm9yIG5hbWUgaW4gYnVpbGRlcl9uYW1lcy5zcGxpdCgiLCIpXQor ICAgICAgICAgICAgICAgIGJ1aWxkZXJzX3RvX2NoZWNrICs9IFtzZWxmLl9idWlsZGVyX3dpdGhf bmFtZShuYW1lKSBmb3IgbmFtZSBpbiBidWlsZGVyX25hbWVzLnNwbGl0KCIsIildCiAgICAgICAg IGVsc2U6Ci0gICAgICAgICAgICBidWlsZGVycyA9IHNlbGYuX2J1aWxkZXJzX3RvX3B1bGxfZnJv bSgpCisgICAgICAgICAgICBidWlsZGVyc190b19jaGVjayA9IHNlbGYuX2J1aWxkZXJzX3RvX3B1 bGxfZnJvbSgpCiAKICAgICAgICAgdGVzdF9saXN0ID0ge30KICAgICAgICAgc3VmZml4ZXNfdG9f dXBkYXRlID0gb3B0aW9ucy5zdWZmaXhlcy5zcGxpdCgiLCIpCiAKLSAgICAgICAgZm9yIGJ1aWxk ZXIgaW4gYnVpbGRlcnM6CisgICAgICAgIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzX3RvX2NoZWNr OgogICAgICAgICAgICAgdGVzdHMgPSBhcmdzIG9yIHNlbGYuX3Rlc3RzX3RvX3VwZGF0ZShidWls ZGVyKQogICAgICAgICAgICAgZm9yIHRlc3QgaW4gdGVzdHM6CiAgICAgICAgICAgICAgICAgaWYg dGVzdCBub3QgaW4gdGVzdF9saXN0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQppbmRleCAzYmYxODg4 Li40OTA1NmMwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQpAQCAtNDUsNyArNDUsNyBAQCBjbGFz cyBfQmFzZVRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiBzZXRVcChzZWxm KToKICAgICAgICAgc2VsZi50b29sID0gTW9ja1Rvb2woKQotICAgICAgICBzZWxmLmNvbW1hbmQg PSBzZWxmLmNvbW1hbmRfY29uc3RydWN0b3IoKQorICAgICAgICBzZWxmLmNvbW1hbmQgPSBzZWxm LmNvbW1hbmRfY29uc3RydWN0b3IoKSAgIyBsaW50IHdhcm5zIHRoYXQgY29tbWFuZF9jb25zdHJ1 Y3RvciBtaWdodCBub3QgYmUgc2V0LCBidXQgdGhpcyBpcyBpbnRlbnRpb25hbDsgcHlsaW50OiBk aXNhYmxlLW1zZz1FMTEwMgogICAgICAgICBzZWxmLmNvbW1hbmQuYmluZF90b190b29sKHNlbGYu dG9vbCkKICAgICAgICAgc2VsZi5saW9uX3BvcnQgPSBzZWxmLnRvb2wucG9ydF9mYWN0b3J5Lmdl dF9mcm9tX2J1aWxkZXJfbmFtZSgiV2ViS2l0IE1hYzEwLjciKQogICAgICAgICBzZWxmLmxpb25f ZXhwZWN0YXRpb25zX3BhdGggPSBzZWxmLmxpb25fcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRp b25zX2ZpbGUoKQpAQCAtMzcwLDEwICszNzAsMTAgQEAgY2xhc3MgVGVzdEFuYWx5emVCYXNlbGlu ZXMoX0Jhc2VUZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzdXBlcihU ZXN0QW5hbHl6ZUJhc2VsaW5lcywgc2VsZikuc2V0VXAoKQogICAgICAgICBzZWxmLnBvcnQgPSBz ZWxmLnRvb2wucG9ydF9mYWN0b3J5LmdldCgndGVzdCcpCi0gICAgICAgIHNlbGYudG9vbC5wb3J0 X2ZhY3RvcnkuZ2V0ID0gbGFtYmRhIHBvcnRfbmFtZT1Ob25lLCBvcHRpb25zPU5vbmU6IHNlbGYu cG9ydAorICAgICAgICBzZWxmLnRvb2wucG9ydF9mYWN0b3J5LmdldCA9IChsYW1iZGEgcG9ydF9u YW1lPU5vbmUsIG9wdGlvbnM9Tm9uZTogc2VsZi5wb3J0KQogICAgICAgICBzZWxmLmxpbmVzID0g W10KICAgICAgICAgc2VsZi5jb21tYW5kLl9vcHRpbWl6ZXJfY2xhc3MgPSBfRmFrZU9wdGltaXpl cgotICAgICAgICBzZWxmLmNvbW1hbmQuX3dyaXRlID0gbGFtYmRhIG1zZzogc2VsZi5saW5lcy5h cHBlbmQobXNnKQorICAgICAgICBzZWxmLmNvbW1hbmQuX3dyaXRlID0gKGxhbWJkYSBtc2c6IHNl bGYubGluZXMuYXBwZW5kKG1zZykpICAjIHB5bGludCBidWcgd2FybmluZyBhYm91dCB1bm5lY2Vz c2FyeSBsYW1iZGE/IHB5bGludDogZGlzYWJsZS1tc2c9VzAxMDgKIAogICAgIGRlZiB0ZXN0X2Rl ZmF1bHQoc2VsZik6CiAgICAgICAgIHNlbGYuY29tbWFuZC5leGVjdXRlKE1vY2tPcHRpb25zKHN1 ZmZpeGVzPSd0eHQnLCBtaXNzaW5nPUZhbHNlLCBwbGF0Zm9ybT1Ob25lKSwgWydwYXNzZXMvdGV4 dC5odG1sJ10sIHNlbGYudG9vbCkK 172389 2012-11-05 13:26:36 -0800 2012-11-05 14:00:09 -0800 Upload the correct patch 101246.patch text/plain 5089 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGRhZWJlY2EuLmM5YTA0ZmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTA1ICBM aWFuZ2h1aSBDaGVuICA8bGlhY2hlbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBE byBub3QgZGlzcGxheSBlcnJvciBwYWdlIGZvciBmYWlsZWQgZG93bmxvYWRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyNDYKKworICAgICAgICBJ bnRlcm5hbCBQUjogMjM2MzE4CisgICAgICAgIEludGVybmFsIHJldmlld2VkIGJ5IEpvZSBNYXNv biwgTGVvIFlhbmcuCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJpZ2h0IG5vdyB3aGVuIGEgbWFpbiBsb2FkLCBpbmNsdWRpbmcgYWxsIGRvd25sb2Fkcywg ZmFpbGVkLCBpdCB3aWxsCisgICAgICAgIGRpc3BsYXkgYW4gZXJyb3IgcGFnZS4gVGhpcyBpcyBu b3QgdmVyeSB1c2VyIGZyaWVuZGx5LCBlc3BlY2lhbGx5IGZvcgorICAgICAgICBXZWJXb3JrcyBh cHBsaWNhdGlvbiwgd2hpY2ggd2FudCB0byB1c2UgaXRzIG93biB1c2VyIGludGVyZmFjZSB0byBp bmZvCisgICAgICAgIHVzZXIgYWJvdXQgdGhlIGZhaWx1cmUuCisgICAgICAgIFNvIHdlIGp1c3Qg c3RvcCBkaXNwbGF5aW5nIGVycm9yIHBhZ2UgZm9yIGRvd25sb2Fkcy4KKworICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoRGlkRmFpbFByb3Zp c2lvbmFsTG9hZCk6CisKIDIwMTItMTEtMDUgIEdlbmV2aWV2ZSBNYWsgIDxnbWFrQHJpbS5jb20+ CiAKICAgICAgICAgW0JMQUNLQkVSUlldIFVwZGF0ZSB0b3VjaCBjb2RlIHRvIHJlZmxlY3QgdG91 Y2ggcmVmYWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAK aW5kZXggMWY2OTZhNy4uM2MwMTRhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeS5jcHAKQEAgLTcwOSwzMyArNzA5LDM4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3Vy Y2VFCiAgICAgaWYgKCFpc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBTdHJp bmcgZXJyb3JQYWdlID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPmdldEVycm9yUGFnZShl cnJvci5lcnJvckNvZGUoKSwgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSwgZXJyb3IuZmFp bGluZ1VSTCgpKTsKLQogICAgIC8vIE1ha2Ugc3VyZSB3ZSdyZSBzdGlsbCBpbiB0aGUgcHJvdmlz aW9uYWxMb2FkIHN0YXRlIC0gZ2V0RXJyb3JQYWdlIHJ1bnMgYQogICAgIC8vIG5lc3RlZCBldmVu dCBsb29wIHdoaWxlIGl0J3Mgd2FpdGluZyBmb3IgY2xpZW50IHJlc291cmNlcyB0byBsb2FkIHNv CiAgICAgLy8gdGhlcmUncyBhIHNtYWxsIHdpbmRvdyBmb3IgdGhlIHVzZXIgdG8gaGl0IHN0b3Au Ci0gICAgaWYgKG1fZnJhbWUtPmxvYWRlcigpLT5wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCkp IHsKLSAgICAgICAgU3Vic3RpdHV0ZURhdGEgZXJyb3JEYXRhKHV0ZjhCdWZmZXIoZXJyb3JQYWdl KSwgInRleHQvaHRtbCIsICJ1dGYtOCIsIEtVUkwoS1VSTCgpLCBlcnJvci5mYWlsaW5nVVJMKCkp KTsKLQotICAgICAgICBSZXNvdXJjZVJlcXVlc3Qgb3JpZ2luYWxSZXF1ZXN0ID0gbV9mcmFtZS0+ bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKS0+b3JpZ2luYWxSZXF1ZXN0KCk7 Ci0KLSAgICAgICAgLy8gTG9hZGluZyB1c2luZyBTdWJzdGl0dXRlRGF0YSB3aWxsIHJlcGxhY2Ug dGhlIG9yaWdpbmFsIHJlcXVlc3Qgd2l0aCBvdXIKLSAgICAgICAgLy8gZXJyb3IgZGF0YS4gVGhp cyBtdXN0IGJlIGRvbmUgd2l0aGluIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZCwKLSAg ICAgICAgLy8gYW5kIGRvIE5PVCBjYWxsIHN0b3BBbGxMb2FkZXJzIGZpcnN0LCBiZWNhdXNlIHRo ZSBsb2FkZXIgY2hlY2tzIHRoZQotICAgICAgICAvLyBwcm92aXNpb25hbERvY3VtZW50TG9hZGVy IHRvIGRlY2lkZSB0aGUgbG9hZCB0eXBlOyBpZiBjYWxsZWQgYW55IG90aGVyCi0gICAgICAgIC8v IHdheSwgdGhlIGVycm9yIHBhZ2UgaXMgYWRkZWQgdG8gdGhlIGVuZCBvZiB0aGUgaGlzdG9yeSBp bnN0ZWFkIG9mCi0gICAgICAgIC8vIHJlcGxhY2luZyB0aGUgZmFpbGVkIGxvYWQuCi0gICAgICAg IC8vCi0gICAgICAgIC8vIElmIHRoaXMgY29tZXMgZnJvbSBhIGJhY2svZm9yd2FyZCBuYXZpZ2F0 aW9uLCB3ZSBuZWVkIHRvIHNhdmUgdGhlIGN1cnJlbnQgdmlld3N0YXRlCi0gICAgICAgIC8vIHRv IG9yaWdpbmFsIGhpc3RvcnlpdGVtLCBhbmQgcHJldmVudCB0aGUgcmVzdG9yZSBvZiB2aWV3IHN0 YXRlIHRvIHRoZSBlcnJvciBwYWdlLgotICAgICAgICBpZiAoaXNCYWNrRm9yd2FyZExvYWRUeXBl KG1fZnJhbWUtPmxvYWRlcigpLT5sb2FkVHlwZSgpKSkgewotICAgICAgICAgICAgbV9mcmFtZS0+ bG9hZGVyKCktPmhpc3RvcnkoKS0+c2F2ZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlVG9JdGVt KG1fZnJhbWUtPmxvYWRlcigpLT5oaXN0b3J5KCktPmN1cnJlbnRJdGVtKCkpOwotICAgICAgICAg ICAgQVNTRVJUKG1fZnJhbWUtPmxvYWRlcigpLT5oaXN0b3J5KCktPnByb3Zpc2lvbmFsSXRlbSgp KTsKLSAgICAgICAgICAgIG1fZnJhbWUtPmxvYWRlcigpLT5oaXN0b3J5KCktPnByb3Zpc2lvbmFs SXRlbSgpLT52aWV3U3RhdGUoKS5zaG91bGRTYXZlVmlld1N0YXRlID0gZmFsc2U7Ci0gICAgICAg IH0KLSAgICAgICAgbV9sb2FkaW5nRXJyb3JQYWdlID0gdHJ1ZTsKLSAgICAgICAgbV9mcmFtZS0+ bG9hZGVyKCktPmxvYWQob3JpZ2luYWxSZXF1ZXN0LCBlcnJvckRhdGEsIGZhbHNlKTsKKyAgICBp ZiAoIW1fZnJhbWUtPmxvYWRlcigpLT5wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIFJlc291cmNlUmVxdWVzdCBvcmlnaW5hbFJlcXVlc3QgPSBtX2Zy YW1lLT5sb2FkZXIoKS0+cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpLT5vcmlnaW5hbFJlcXVl c3QoKTsKKworICAgIC8vIERvIG5vdCBzaG93IGVycm9yIHBhZ2UgZm9yIGEgZmFpbGVkIGRvd25s b2FkLgorICAgIGlmIChvcmlnaW5hbFJlcXVlc3QuZm9yY2VEb3dubG9hZCgpKQorICAgICAgICBy ZXR1cm47CisKKyAgICBTdHJpbmcgZXJyb3JQYWdlID0gbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGll bnQtPmdldEVycm9yUGFnZShlcnJvci5lcnJvckNvZGUoKSwgZXJyb3IubG9jYWxpemVkRGVzY3Jp cHRpb24oKSwgZXJyb3IuZmFpbGluZ1VSTCgpKTsKKyAgICBTdWJzdGl0dXRlRGF0YSBlcnJvckRh dGEodXRmOEJ1ZmZlcihlcnJvclBhZ2UpLCAidGV4dC9odG1sIiwgInV0Zi04IiwgS1VSTChLVVJM KCksIGVycm9yLmZhaWxpbmdVUkwoKSkpOworCisgICAgLy8gTG9hZGluZyB1c2luZyBTdWJzdGl0 dXRlRGF0YSB3aWxsIHJlcGxhY2UgdGhlIG9yaWdpbmFsIHJlcXVlc3Qgd2l0aCBvdXIKKyAgICAv LyBlcnJvciBkYXRhLiBUaGlzIG11c3QgYmUgZG9uZSB3aXRoaW4gZGlzcGF0Y2hEaWRGYWlsUHJv dmlzaW9uYWxMb2FkLAorICAgIC8vIGFuZCBkbyBOT1QgY2FsbCBzdG9wQWxsTG9hZGVycyBmaXJz dCwgYmVjYXVzZSB0aGUgbG9hZGVyIGNoZWNrcyB0aGUKKyAgICAvLyBwcm92aXNpb25hbERvY3Vt ZW50TG9hZGVyIHRvIGRlY2lkZSB0aGUgbG9hZCB0eXBlOyBpZiBjYWxsZWQgYW55IG90aGVyCisg ICAgLy8gd2F5LCB0aGUgZXJyb3IgcGFnZSBpcyBhZGRlZCB0byB0aGUgZW5kIG9mIHRoZSBoaXN0 b3J5IGluc3RlYWQgb2YKKyAgICAvLyByZXBsYWNpbmcgdGhlIGZhaWxlZCBsb2FkLgorICAgIC8v CisgICAgLy8gSWYgdGhpcyBjb21lcyBmcm9tIGEgYmFjay9mb3J3YXJkIG5hdmlnYXRpb24sIHdl IG5lZWQgdG8gc2F2ZSB0aGUgY3VycmVudCB2aWV3c3RhdGUKKyAgICAvLyB0byBvcmlnaW5hbCBo aXN0b3J5aXRlbSwgYW5kIHByZXZlbnQgdGhlIHJlc3RvcmUgb2YgdmlldyBzdGF0ZSB0byB0aGUg ZXJyb3IgcGFnZS4KKyAgICBpZiAoaXNCYWNrRm9yd2FyZExvYWRUeXBlKG1fZnJhbWUtPmxvYWRl cigpLT5sb2FkVHlwZSgpKSkgeworICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgp LT5zYXZlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGVUb0l0ZW0obV9mcmFtZS0+bG9hZGVyKCkt Pmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKSk7CisgICAgICAgIEFTU0VSVChtX2ZyYW1lLT5sb2Fk ZXIoKS0+aGlzdG9yeSgpLT5wcm92aXNpb25hbEl0ZW0oKSk7CisgICAgICAgIG1fZnJhbWUtPmxv YWRlcigpLT5oaXN0b3J5KCktPnByb3Zpc2lvbmFsSXRlbSgpLT52aWV3U3RhdGUoKS5zaG91bGRT YXZlVmlld1N0YXRlID0gZmFsc2U7CiAgICAgfQorCisgICAgbV9sb2FkaW5nRXJyb3JQYWdlID0g dHJ1ZTsKKyAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+bG9hZChvcmlnaW5hbFJlcXVlc3QsIGVycm9y RGF0YSwgZmFsc2UpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGlz cGF0Y2hXaWxsU3VibWl0Rm9ybShGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uLCBQYXNzUmVm UHRyPEZvcm1TdGF0ZT4pCg==