83767 2012-04-12 03:28:28 -0700 [BlackBerry] Revert the patch for 82764 2012-04-12 07:55:52 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 83360 1 charles.wei charles.wei joenotcharles rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 601069 0 charles.wei 2012-04-12 03:28:28 -0700 The patch for bug 82764 is causing massive mis-function of BlackBerry porting and has been reverted internally. This patch reverts it also in upstream code to keep the upstream and internal repo in sync. 601074 1 136869 charles.wei 2012-04-12 03:35:10 -0700 Created attachment 136869 Patch 601103 2 136869 rwlbuis 2012-04-12 04:53:22 -0700 Comment on attachment 136869 Patch When did this go in? Is there a PR for this? 601106 3 136869 rwlbuis 2012-04-12 04:57:44 -0700 Comment on attachment 136869 Patch Ok, I see the original commit now. Can you explain more in the ChangeLog about the misfunction? And refer to the PR if it is there please. 601131 4 charles.wei 2012-04-12 05:43:09 -0700 (In reply to comment #3) > (From update of attachment 136869 [details]) > Ok, I see the original commit now. Can you explain more in the ChangeLog about the misfunction? And refer to the PR if it is there please. The malfunction is not caused by the patch in the webkit here, but in the platform code. This patch is reverted because of it's dependency on the platform part is reverted. I can change the commit log to include the internal PR, but it doesn't make much sense to detail the mis-function, I think, because it's not caused by the patch here :-) 601141 5 136869 rwlbuis 2012-04-12 06:01:27 -0700 Comment on attachment 136869 Patch Looks good, but please include the PR before landing. 601182 6 136896 charles.wei 2012-04-12 06:51:48 -0700 Created attachment 136896 Patch 601184 7 charles.wei 2012-04-12 06:54:03 -0700 (In reply to comment #5) > (From update of attachment 136869 [details]) > Looks good, but please include the PR before landing. Sorry , there's no internal PR that reverted the patch internally. I did included the internal SHA for reference. 601225 8 tonikitoo 2012-04-12 07:53:39 -0700 you can use the sheriffbot to revert patches 601227 9 136896 webkit.review.bot 2012-04-12 07:55:47 -0700 Comment on attachment 136896 Patch Clearing flags on attachment: 136896 Committed r113976: <http://trac.webkit.org/changeset/113976> 601228 10 webkit.review.bot 2012-04-12 07:55:52 -0700 All reviewed patches have been landed. Closing bug. 136869 2012-04-12 03:35:10 -0700 2012-04-12 06:51:24 -0700 Patch bug-83767-20120412184108.patch text/plain 5446 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODg0YjgwNzFhNGFhMjkw OWMzNTU2ZmFiNTA1ZDJmOTRjMjJlOTg2My4uMjViNmQ0NDlkYzMxYzU0OGE4ZTg2MGMxY2Q4Nzhl ZjlmOWExYTRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTA0LTEyICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KIAorICAgICAgICBbQmxh Y2tCZXJyeV0gUmV2ZXJ0IHRoZSBwYXRjaCBmb3IgODI3NjQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0IHRoZSBwYXRjaCBmb3IgODI3NjQsIHdo aWNoIGlzIGNhdXNpbmcgbWlzZnVuY3Rpb24uCisKKyAgICAgICAgKiBwbHVnaW5zL2JsYWNrYmVy cnkvUGx1Z2luVmlld0JsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmll dzo6c2V0TlBXaW5kb3dJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojpw bGF0Zm9ybUdldFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBsYXRmb3Jt RGVzdHJveSk6CisgICAgICAgICogcGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblZpZXdQcml2YXRl QmxhY2tCZXJyeS5oOgorICAgICAgICAoUGx1Z2luVmlld1ByaXZhdGUpOgorCisyMDEyLTA0LTEy ICBDaGFybGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKwogICAgICAg ICBbQmxhY2tCZXJyeV0gVXBzdHJlYW1pbmcgQmxhY2tCZXJyeS1zcGVjaWZpYyBjaGFuZ2VzIHRv IFBsdWdpblZpZXcgLS0gcmVtb3ZlIHVudXNlZCBmdW5jdGlvbnMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzU2CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5WaWV3QmxhY2tCZXJyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luVmlld0JsYWNrQmVycnkuY3Bw CmluZGV4IDk2MDViZGE0YmU4OTQxN2VlNDZlODM3ZjM2ZTI2NmE3MTAzNjQ0N2QuLmI2MjkzM2Qz MTM3NjgwOWU5MDA3MzBlMThjYzNlMTFkYWRjMzE1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5WaWV3QmxhY2tCZXJyeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblZpZXdCbGFja0JlcnJ5LmNwcApA QCAtMiw3ICsyLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuICBB bGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgR2lyaXNoIFJhbWFr cmlzaG5hbiA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgotICogQ29weXJpZ2h0IChDKSAyMDExLCAy MDEyIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICog Q29weXJpZ2h0IChDKSAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC05NjYsMTEgKzk2 Niw4IEBAIHZvaWQgUGx1Z2luVmlldzo6c2V0TlBXaW5kb3dJZk5lZWRlZCgpCiAgICAgbV9ucFdp bmRvdy50eXBlID0gTlBXaW5kb3dUeXBlRHJhd2FibGU7CiAKICAgICBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6R3JhcGhpY3M6OldpbmRvdyogd2luZG93ID0gZnJhbWVWaWV3LT5ob3N0V2luZG93KCkt PnBsYXRmb3JtUGFnZUNsaWVudCgpLT5wbGF0Zm9ybVdpbmRvdygpOwotICAgIGlmICh3aW5kb3cp IHsKLSAgICAgICAgLy8gTWFrZSBhIGxvY2FsIGNvcHkgb2YgdGhlIHdpbmRvdyBncm91cCB0byBi ZSBzdXJlIGl0IGRvZXNuJ3QgZ28gb3V0IG9mIHNjb3BlIHdoaWxlIHRoZSB3c19pbmZvIHN0cnVj dCBleGlzdHMKLSAgICAgICAgbV9wcml2YXRlLT5tX3dpbmRvd0dyb3VwID0gd2luZG93LT53aW5k b3dHcm91cCgpOwotICAgICAgICAoKE5QU2V0V2luZG93Q2FsbGJhY2tTdHJ1Y3QqKSBtX25wV2lu ZG93LndzX2luZm8pLT53aW5kb3dHcm91cCA9IG1fcHJpdmF0ZS0+bV93aW5kb3dHcm91cC5jX3N0 cigpOwotICAgIH0KKyAgICBpZiAod2luZG93KQorICAgICAgICAoKE5QU2V0V2luZG93Q2FsbGJh Y2tTdHJ1Y3QqKW1fbnBXaW5kb3cud3NfaW5mbyktPndpbmRvd0dyb3VwID0gd2luZG93LT53aW5k b3dHcm91cCgpOwogCiAgICAgUGx1Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZpZXcodGhpcyk7 CiAgICAgSlNDOjpKU0xvY2s6OkRyb3BBbGxMb2NrcyBkcm9wQWxsTG9ja3MoSlNDOjpTaWxlbmNl QXNzZXJ0aW9uc09ubHkpOwpAQCAtMTA4OSwxMiArMTA4Niw4IEBAIGJvb2wgUGx1Z2luVmlldzo6 cGxhdGZvcm1HZXRWYWx1ZShOUE5WYXJpYWJsZSB2YXJpYWJsZSwgdm9pZCogdmFsdWUsIE5QRXJy b3IqIHJlCiAgICAgICAgIGlmIChmcmFtZVZpZXcpIHsKICAgICAgICAgICAgIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpHcmFwaGljczo6V2luZG93ICp3aW5kb3cgPSBmcmFtZVZpZXctPmhvc3RXaW5k b3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCktPnBsYXRmb3JtV2luZG93KCk7CiAgICAgICAgICAg ICBpZiAod2luZG93KSB7Ci0gICAgICAgICAgICAgICAgLy8gTWFrZSBhIGNvcHkgb2YgdGhlIHJv b3QgZ3JvdXAgdG8gYmUgc3VyZSBpdCBkb2Vzbid0IGdvIG91dCBvZiBzY29wZS4KLSAgICAgICAg ICAgICAgICBtX3ByaXZhdGUtPm1fcm9vdEdyb3VwID0gd2luZG93LT5yb290R3JvdXAoKTsKLQot ICAgICAgICAgICAgICAgIC8vIFN0b3JlIGl0IGludG8gdmFsdWUgdGhyb3VnaCBhbiBpbmRpcmVj dCBwb2ludGVyLgogICAgICAgICAgICAgICAgIHZvaWQqKiB0ZW1wVmFsdWUgPSBzdGF0aWNfY2Fz dDx2b2lkKio+KHZhbHVlKTsKLSAgICAgICAgICAgICAgICAqdGVtcFZhbHVlID0gcmVpbnRlcnBy ZXRfY2FzdDx2b2lkKj4oY29uc3RfY2FzdDxjaGFyKj4obV9wcml2YXRlLT5tX3Jvb3RHcm91cC5j X3N0cigpKSk7CisgICAgICAgICAgICAgICAgKnRlbXBWYWx1ZSA9ICh2b2lkKil3aW5kb3ctPnJv b3RHcm91cCgpOwogCiAgICAgICAgICAgICAgICAgaWYgKCp0ZW1wVmFsdWUpIHsKICAgICAgICAg ICAgICAgICAgICAgKnJlc3VsdCA9IE5QRVJSX05PX0VSUk9SOwpAQCAtMTExMSwxMiArMTEwNCw4 IEBAIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1HZXRWYWx1ZShOUE5WYXJpYWJsZSB2YXJpYWJs ZSwgdm9pZCogdmFsdWUsIE5QRXJyb3IqIHJlCiAgICAgICAgIGlmIChmcmFtZVZpZXcpIHsKICAg ICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6V2luZG93KiB3aW5kb3cg PSBmcmFtZVZpZXctPmhvc3RXaW5kb3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCktPnBsYXRmb3Jt V2luZG93KCk7CiAgICAgICAgICAgICBpZiAod2luZG93KSB7Ci0gICAgICAgICAgICAgICAgLy8g TWFrZSBhIGNvcHkgb2YgdGhlIHdpbmRvdyBncm91cCB0byBiZSBzdXJlIGl0IGRvZXNuJ3QgZ28g b3V0IG9mIHNjb3BlLgotICAgICAgICAgICAgICAgIG1fcHJpdmF0ZS0+bV93aW5kb3dHcm91cCA9 IHdpbmRvdy0+d2luZG93R3JvdXAoKTsKLQotICAgICAgICAgICAgICAgIC8vIFN0b3JlIGl0IGlu dG8gdmFsdWUgdGhyb3VnaCBhbiBpbmRpcmVjdCBwb2ludGVyLgogICAgICAgICAgICAgICAgIHZv aWQqKiB0ZW1wVmFsdWUgPSBzdGF0aWNfY2FzdDx2b2lkKio+KHZhbHVlKTsKLSAgICAgICAgICAg ICAgICAqdGVtcFZhbHVlID0gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oY29uc3RfY2FzdDxjaGFy Kj4obV9wcml2YXRlLT5tX3dpbmRvd0dyb3VwLmNfc3RyKCkpKTsKKyAgICAgICAgICAgICAgICAq dGVtcFZhbHVlID0gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oY29uc3RfY2FzdDxjaGFyKj4od2lu ZG93LT53aW5kb3dHcm91cCgpKSk7CiAKICAgICAgICAgICAgICAgICBpZiAoKnRlbXBWYWx1ZSkg ewogICAgICAgICAgICAgICAgICAgICAqcmVzdWx0ID0gTlBFUlJfTk9fRVJST1I7CkBAIC0xMjc2 LDEwICsxMjY1LDYgQEAgdm9pZCBQbHVnaW5WaWV3OjpwbGF0Zm9ybURlc3Ryb3koKQogICAgIGlm ICghbV9wcml2YXRlKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyB3c19pbmZvLT53aW5kb3dH cm91cCBwb2ludHMgdG8gbWVtb3J5IGluIG1fcHJpdmF0ZSwgd2hpY2ggaXMgYWJvdXQgdG8gZ28g YXdheSAodW5sZXNzIGl0IGlzIHVuaW5pdGlhbGl6ZWQgYXQgdGhpcyBwb2ludCkKLSAgICBpZiAo bV9ucFdpbmRvdy53c19pbmZvKQotICAgICAgICAoKE5QU2V0V2luZG93Q2FsbGJhY2tTdHJ1Y3Qq KW1fbnBXaW5kb3cud3NfaW5mbyktPndpbmRvd0dyb3VwID0gMDsKLQogICAgIC8vIFRoaXMgd2ls bCB1bmxvY2sgdGhlIGlkbGUgKGlmIHdlIGhhdmUgbG9ja2VkIGl0KS4KICAgICBtX3ByaXZhdGUt PnByZXZlbnRJZGxlKGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9ibGFja2JlcnJ5L1BsdWdpblZpZXdQcml2YXRlQmxhY2tCZXJyeS5oIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblZpZXdQcml2YXRlQmxhY2tCZXJyeS5oCmluZGV4 IGI5ZGQyMTgyYzA4Mjg2YzU3YmRlOWQ1ZDQ5YTE5NjFhMmQzYTViNTguLjNmMjg3OGZkZjUyNzBj M2RkMGE1NDhjY2U2ODVlMDI0OWI3MjA5NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs dWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5WaWV3UHJpdmF0ZUJsYWNrQmVycnkuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luVmlld1ByaXZhdGVCbGFja0JlcnJ5 LmgKQEAgLTgzLDggKzgzLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNCYWNrZ3JvdW5kUGxh eWluZzsKIAogICAgIHN0ZDo6c3RyaW5nIG1fcGx1Z2luVW5pcXVlUHJlZml4OwotICAgIHN0ZDo6 c3RyaW5nIG1fd2luZG93R3JvdXA7Ci0gICAgc3RkOjpzdHJpbmcgbV9yb290R3JvdXA7CiAKICAg ICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiBtX2ludmFsaWRhdGVSZWdpb247 CiAgICAgZnJpZW5kIGNsYXNzIFBsdWdpblZpZXc7Cg== 136896 2012-04-12 06:51:48 -0700 2012-04-12 07:55:47 -0700 Patch bug-83767-20120412215744.patch text/plain 5366 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE4OWE3NGQzNjc1NWIx MzYyNDBkZWYzNWU3NjZmMTNiNWE4MjNjYy4uNzRiZGQ1MGEyMjg2YTYyZDNhZDZiNjMwMjAwYjY4 YWFkN2ZjNDgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTEyICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gUmV2ZXJ0IHRoZSBwYXRjaCBmb3IgODI3NjQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Um9iIEJ1aXMuCisKKyAgICAgICAgUmV2ZXJ0IHRoZSBwYXRjaCBmb3IgODI3NjQsIHdoaWNoIGlz IGNhdXNpbmcgbWlzZnVuY3Rpb24uCisgICAgICAgIFRoZSBpbnRlcm5hbCBjb21taXQgaXM6IDgw MDIxM2Y1CisKKyAgICAgICAgKiBwbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luVmlld0JsYWNrQmVy cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6c2V0TlBXaW5kb3dJZk5lZWRl ZCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybUdldFZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBsYXRmb3JtRGVzdHJveSk6CisgICAgICAgICog cGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblZpZXdQcml2YXRlQmxhY2tCZXJyeS5oOgorICAgICAg ICAoUGx1Z2luVmlld1ByaXZhdGUpOgorCiAyMDEyLTAzLTA1ICBQaWVycmUgUm9zc2kgIDxwaWVy cmUucm9zc2lAZ21haWwuY29tPgogCiAgICAgICAgIFtRdF0gVXNlIFFSYXdGb250IHdoZW4gYnVp bGRpbmcgd2l0aCBRdCA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNr YmVycnkvUGx1Z2luVmlld0JsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9i bGFja2JlcnJ5L1BsdWdpblZpZXdCbGFja0JlcnJ5LmNwcAppbmRleCA5NjA1YmRhNGJlODk0MTdl ZTQ2ZTgzN2YzNmUyNjZhNzEwMzY0NDdkLi5iNjI5MzNkMzEzNzY4MDllOTAwNzMwZTE4Y2MzZTEx ZGFkYzMxNTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkv UGx1Z2luVmlld0JsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvYmxh Y2tiZXJyeS9QbHVnaW5WaWV3QmxhY2tCZXJyeS5jcHAKQEAgLTIsNyArMiw3IEBACiAgKiBDb3B5 cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq IENvcHlyaWdodCAoQykgMjAwOCBDb2xsYWJvcmEgTHRkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICogQ29weXJpZ2h0IChDKSAyMDA5IEdpcmlzaCBSYW1ha3Jpc2huYW4gPGdpcmlzaEBmb3J3YXJk Ymlhcy5pbj4KLSAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24g TGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBSZXNl YXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtOTY2LDExICs5NjYsOCBAQCB2b2lkIFBsdWdpblZpZXc6 OnNldE5QV2luZG93SWZOZWVkZWQoKQogICAgIG1fbnBXaW5kb3cudHlwZSA9IE5QV2luZG93VHlw ZURyYXdhYmxlOwogCiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpXaW5kb3cq IHdpbmRvdyA9IGZyYW1lVmlldy0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKS0+ cGxhdGZvcm1XaW5kb3coKTsKLSAgICBpZiAod2luZG93KSB7Ci0gICAgICAgIC8vIE1ha2UgYSBs b2NhbCBjb3B5IG9mIHRoZSB3aW5kb3cgZ3JvdXAgdG8gYmUgc3VyZSBpdCBkb2Vzbid0IGdvIG91 dCBvZiBzY29wZSB3aGlsZSB0aGUgd3NfaW5mbyBzdHJ1Y3QgZXhpc3RzCi0gICAgICAgIG1fcHJp dmF0ZS0+bV93aW5kb3dHcm91cCA9IHdpbmRvdy0+d2luZG93R3JvdXAoKTsKLSAgICAgICAgKChO UFNldFdpbmRvd0NhbGxiYWNrU3RydWN0KikgbV9ucFdpbmRvdy53c19pbmZvKS0+d2luZG93R3Jv dXAgPSBtX3ByaXZhdGUtPm1fd2luZG93R3JvdXAuY19zdHIoKTsKLSAgICB9CisgICAgaWYgKHdp bmRvdykKKyAgICAgICAgKChOUFNldFdpbmRvd0NhbGxiYWNrU3RydWN0KiltX25wV2luZG93Lndz X2luZm8pLT53aW5kb3dHcm91cCA9IHdpbmRvdy0+d2luZG93R3JvdXAoKTsKIAogICAgIFBsdWdp blZpZXc6OnNldEN1cnJlbnRQbHVnaW5WaWV3KHRoaXMpOwogICAgIEpTQzo6SlNMb2NrOjpEcm9w QWxsTG9ja3MgZHJvcEFsbExvY2tzKEpTQzo6U2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKQEAgLTEw ODksMTIgKzEwODYsOCBAQCBib29sIFBsdWdpblZpZXc6OnBsYXRmb3JtR2V0VmFsdWUoTlBOVmFy aWFibGUgdmFyaWFibGUsIHZvaWQqIHZhbHVlLCBOUEVycm9yKiByZQogICAgICAgICBpZiAoZnJh bWVWaWV3KSB7CiAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6Oldp bmRvdyAqd2luZG93ID0gZnJhbWVWaWV3LT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNsaWVu dCgpLT5wbGF0Zm9ybVdpbmRvdygpOwogICAgICAgICAgICAgaWYgKHdpbmRvdykgewotICAgICAg ICAgICAgICAgIC8vIE1ha2UgYSBjb3B5IG9mIHRoZSByb290IGdyb3VwIHRvIGJlIHN1cmUgaXQg ZG9lc24ndCBnbyBvdXQgb2Ygc2NvcGUuCi0gICAgICAgICAgICAgICAgbV9wcml2YXRlLT5tX3Jv b3RHcm91cCA9IHdpbmRvdy0+cm9vdEdyb3VwKCk7Ci0KLSAgICAgICAgICAgICAgICAvLyBTdG9y ZSBpdCBpbnRvIHZhbHVlIHRocm91Z2ggYW4gaW5kaXJlY3QgcG9pbnRlci4KICAgICAgICAgICAg ICAgICB2b2lkKiogdGVtcFZhbHVlID0gc3RhdGljX2Nhc3Q8dm9pZCoqPih2YWx1ZSk7Ci0gICAg ICAgICAgICAgICAgKnRlbXBWYWx1ZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGNvbnN0X2Nh c3Q8Y2hhcio+KG1fcHJpdmF0ZS0+bV9yb290R3JvdXAuY19zdHIoKSkpOworICAgICAgICAgICAg ICAgICp0ZW1wVmFsdWUgPSAodm9pZCopd2luZG93LT5yb290R3JvdXAoKTsKIAogICAgICAgICAg ICAgICAgIGlmICgqdGVtcFZhbHVlKSB7CiAgICAgICAgICAgICAgICAgICAgICpyZXN1bHQgPSBO UEVSUl9OT19FUlJPUjsKQEAgLTExMTEsMTIgKzExMDQsOCBAQCBib29sIFBsdWdpblZpZXc6OnBs YXRmb3JtR2V0VmFsdWUoTlBOVmFyaWFibGUgdmFyaWFibGUsIHZvaWQqIHZhbHVlLCBOUEVycm9y KiByZQogICAgICAgICBpZiAoZnJhbWVWaWV3KSB7CiAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6R3JhcGhpY3M6OldpbmRvdyogd2luZG93ID0gZnJhbWVWaWV3LT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpLT5wbGF0Zm9ybVdpbmRvdygpOwogICAgICAgICAgICAg aWYgKHdpbmRvdykgewotICAgICAgICAgICAgICAgIC8vIE1ha2UgYSBjb3B5IG9mIHRoZSB3aW5k b3cgZ3JvdXAgdG8gYmUgc3VyZSBpdCBkb2Vzbid0IGdvIG91dCBvZiBzY29wZS4KLSAgICAgICAg ICAgICAgICBtX3ByaXZhdGUtPm1fd2luZG93R3JvdXAgPSB3aW5kb3ctPndpbmRvd0dyb3VwKCk7 Ci0KLSAgICAgICAgICAgICAgICAvLyBTdG9yZSBpdCBpbnRvIHZhbHVlIHRocm91Z2ggYW4gaW5k aXJlY3QgcG9pbnRlci4KICAgICAgICAgICAgICAgICB2b2lkKiogdGVtcFZhbHVlID0gc3RhdGlj X2Nhc3Q8dm9pZCoqPih2YWx1ZSk7Ci0gICAgICAgICAgICAgICAgKnRlbXBWYWx1ZSA9IHJlaW50 ZXJwcmV0X2Nhc3Q8dm9pZCo+KGNvbnN0X2Nhc3Q8Y2hhcio+KG1fcHJpdmF0ZS0+bV93aW5kb3dH cm91cC5jX3N0cigpKSk7CisgICAgICAgICAgICAgICAgKnRlbXBWYWx1ZSA9IHJlaW50ZXJwcmV0 X2Nhc3Q8dm9pZCo+KGNvbnN0X2Nhc3Q8Y2hhcio+KHdpbmRvdy0+d2luZG93R3JvdXAoKSkpOwog CiAgICAgICAgICAgICAgICAgaWYgKCp0ZW1wVmFsdWUpIHsKICAgICAgICAgICAgICAgICAgICAg KnJlc3VsdCA9IE5QRVJSX05PX0VSUk9SOwpAQCAtMTI3NiwxMCArMTI2NSw2IEBAIHZvaWQgUGx1 Z2luVmlldzo6cGxhdGZvcm1EZXN0cm95KCkKICAgICBpZiAoIW1fcHJpdmF0ZSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgLy8gd3NfaW5mby0+d2luZG93R3JvdXAgcG9pbnRzIHRvIG1lbW9yeSBp biBtX3ByaXZhdGUsIHdoaWNoIGlzIGFib3V0IHRvIGdvIGF3YXkgKHVubGVzcyBpdCBpcyB1bmlu aXRpYWxpemVkIGF0IHRoaXMgcG9pbnQpCi0gICAgaWYgKG1fbnBXaW5kb3cud3NfaW5mbykKLSAg ICAgICAgKChOUFNldFdpbmRvd0NhbGxiYWNrU3RydWN0KiltX25wV2luZG93LndzX2luZm8pLT53 aW5kb3dHcm91cCA9IDA7Ci0KICAgICAvLyBUaGlzIHdpbGwgdW5sb2NrIHRoZSBpZGxlIChpZiB3 ZSBoYXZlIGxvY2tlZCBpdCkuCiAgICAgbV9wcml2YXRlLT5wcmV2ZW50SWRsZShmYWxzZSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5WaWV3 UHJpdmF0ZUJsYWNrQmVycnkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9Q bHVnaW5WaWV3UHJpdmF0ZUJsYWNrQmVycnkuaAppbmRleCBiOWRkMjE4MmMwODI4NmM1N2JkZTlk NWQ0OWExOTYxYTJkM2E1YjU4Li4zZjI4NzhmZGY1MjcwYzNkZDBhNTQ4Y2NlNjg1ZTAyNDliNzIw OTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2lu Vmlld1ByaXZhdGVCbGFja0JlcnJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ibGFj a2JlcnJ5L1BsdWdpblZpZXdQcml2YXRlQmxhY2tCZXJyeS5oCkBAIC04Myw4ICs4Myw2IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX2lzQmFja2dyb3VuZFBsYXlpbmc7CiAKICAgICBzdGQ6OnN0cmlu ZyBtX3BsdWdpblVuaXF1ZVByZWZpeDsKLSAgICBzdGQ6OnN0cmluZyBtX3dpbmRvd0dyb3VwOwot ICAgIHN0ZDo6c3RyaW5nIG1fcm9vdEdyb3VwOwogCiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkludFJlY3RSZWdpb24gbV9pbnZhbGlkYXRlUmVnaW9uOwogICAgIGZyaWVuZCBjbGFzcyBQbHVn aW5WaWV3Owo=