39375 2010-05-19 13:18:32 -0700 [Chromium] Don't rely on focused node to route mouse events to plugins. 2010-05-20 19:52:54 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 viettrungluu webkit-unassigned commit-queue fishd jam viettrungluu oldest_to_newest 227964 0 viettrungluu 2010-05-19 13:18:32 -0700 [Chromium] Don't rely on focused node to route mouse events to plugins. 227969 1 56514 viettrungluu 2010-05-19 13:26:34 -0700 Created attachment 56514 Patch 227977 2 56516 viettrungluu 2010-05-19 13:36:16 -0700 Created attachment 56516 Patch 227986 3 jam 2010-05-19 14:03:29 -0700 Thanks for the patch, I've verified this works with my Pepper plugin. 228713 4 56516 commit-queue 2010-05-20 19:52:48 -0700 Comment on attachment 56516 Patch Clearing flags on attachment: 56516 Committed r59901: <http://trac.webkit.org/changeset/59901> 228714 5 commit-queue 2010-05-20 19:52:54 -0700 All reviewed patches have been landed. Closing bug. 56514 2010-05-19 13:26:34 -0700 2010-05-19 13:36:13 -0700 Patch bug-39375-20100519132633.patch text/plain 6552 viettrungluu ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGUwOTU5NTExMmFmMDJhMDY2MWQ2YzczNmQ3NjYyMmE4NDQ0NjIxMjgu LjNmODk3YjQ3OTkxNjg3Mjk0NDZmMjRjNzkwMzAxMGJmMDRhNjFmNTEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIwIEBACisyMDEwLTA1LTE5ICBWaWV0LVRydW5nIEx1dSAgPHZpZXR0cnVuZ2x1 dUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW0Nocm9taXVtXSBEb24ndCByZWx5IG9uIGZvY3VzZWQgbm9kZSB0byByb3V0ZSBt b3VzZSBldmVudHMgdG8gcGx1Z2lucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5Mzc1CisKKyAgICAgICAgT24gbW91c2UgZG93biwgZG8gYSBoaXQg dGVzdCBhbmQgY2hlY2sgaWYgYSBwbHVnaW4gd2FzIGhpdC4gSWYgc28sIHRoZW4KKyAgICAgICAg c2F2ZSB0aGUgbm9kZSBmb3IgZnV0dXJlIG1vdXNlIGV2ZW50cyAodW50aWwgbW91c2UgdXAgb3Ig Y2FwdHVyZSBsb3N0KS4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjptb3VzZURvd24pOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFu ZGxlSW5wdXRFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZUNhcHR1 cmVMb3N0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDogUmVtb3ZlIG1faGF2ZU1vdXNl Q2FwdHVyZTsgYWRkIG1fbW91c2VDYXB0dXJlTm9kZS4KKwogMjAxMC0wNS0xMiAgSGFucyBXZW5u Ym9yZyAgPGhhbnNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBP cmxvdy4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggOTRjZjM2YzQyN2QwZjA5 ZGNkMzc3NDg3ODJmMzlmNDY3ZWVjZWE5Mi4uNjM5MTJhYzY3ZjhkZWE3YjcwOTg1MWNkMWNhZTg3 ZGNhMmE4ZmZmMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIzOSw3ICsy MzksNiBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQog ICAgICwgbV9zdWdnZXN0aW9uc1BvcHVwKDApCiAgICAgLCBtX2lzVHJhbnNwYXJlbnQoZmFsc2Up CiAgICAgLCBtX3RhYnNUb0xpbmtzKGZhbHNlKQotICAgICwgbV9oYXZlTW91c2VDYXB0dXJlKGZh bHNlKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAsIG1fbGF5ZXJSZW5k ZXJlcigwKQogICAgICwgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoZmFsc2UpCkBA IC0zMzcsMTkgKzMzNiwyMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjptb3VzZURvd24oY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpCiAgICAgfQogCiAgICAgbV9sYXN0TW91c2VEb3duUG9pbnQgPSBX ZWJQb2ludChldmVudC54LCBldmVudC55KTsKLSAgICBtX2hhdmVNb3VzZUNhcHR1cmUgPSB0cnVl OwogCi0gICAgLy8gSWYgYSB0ZXh0IGZpZWxkIHRoYXQgaGFzIGZvY3VzIGlzIGNsaWNrZWQgYWdh aW4sIHdlIHNob3VsZCBkaXNwbGF5IHRoZQotICAgIC8vIHN1Z2dlc3Rpb25zIHBvcHVwLgogICAg IFJlZlB0cjxOb2RlPiBjbGlja2VkTm9kZTsKICAgICBpZiAoZXZlbnQuYnV0dG9uID09IFdlYk1v dXNlRXZlbnQ6OkJ1dHRvbkxlZnQpIHsKKyAgICAgICAgSW50UG9pbnQgcG9pbnQoZXZlbnQueCwg ZXZlbnQueSk7CisgICAgICAgIHBvaW50ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpLT53 aW5kb3dUb0NvbnRlbnRzKHBvaW50KTsKKyAgICAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQobV9w YWdlLT5tYWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KHBv aW50LCBmYWxzZSkpOworICAgICAgICBOb2RlKiBoaXROb2RlID0gcmVzdWx0LmlubmVyTm9uU2hh cmVkTm9kZSgpOworCisgICAgICAgIC8vIFRha2UgY2FwdHVyZSBvbiBhIG1vdXNlIGRvd24gb24g YSBwbHVnaW4gc28gd2UgY2FuIHNlbmQgaXQgbW91c2UgZXZlbnRzLgorICAgICAgICBpZiAoaGl0 Tm9kZSAmJiBoaXROb2RlLT5yZW5kZXJlcigpICYmIGhpdE5vZGUtPnJlbmRlcmVyKCktPmlzRW1i ZWRkZWRPYmplY3QoKSkKKyAgICAgICAgICAgIG1fbW91c2VDYXB0dXJlTm9kZSA9IGhpdE5vZGU7 CisKKyAgICAgICAgLy8gSWYgYSB0ZXh0IGZpZWxkIHRoYXQgaGFzIGZvY3VzIGlzIGNsaWNrZWQg YWdhaW4sIHdlIHNob3VsZCBkaXNwbGF5IHRoZQorICAgICAgICAvLyBzdWdnZXN0aW9ucyBwb3B1 cC4KICAgICAgICAgUmVmUHRyPE5vZGU+IGZvY3VzZWROb2RlID0gZm9jdXNlZFdlYkNvcmVOb2Rl KCk7CiAgICAgICAgIGlmIChmb2N1c2VkTm9kZS5nZXQoKSAmJiB0b0hUTUxJbnB1dEVsZW1lbnQo Zm9jdXNlZE5vZGUuZ2V0KCkpKSB7Ci0gICAgICAgICAgICBJbnRQb2ludCBwb2ludChldmVudC54 LCBldmVudC55KTsKLSAgICAgICAgICAgIHBvaW50ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmll dygpLT53aW5kb3dUb0NvbnRlbnRzKHBvaW50KTsKLSAgICAgICAgICAgIEhpdFRlc3RSZXN1bHQg cmVzdWx0KHBvaW50KTsKLSAgICAgICAgICAgIHJlc3VsdCA9IG1fcGFnZS0+bWFpbkZyYW1lKCkt PmV2ZW50SGFuZGxlcigpLT5oaXRUZXN0UmVzdWx0QXRQb2ludChwb2ludCwgZmFsc2UpOwotICAg ICAgICAgICAgaWYgKHJlc3VsdC5pbm5lck5vblNoYXJlZE5vZGUoKSA9PSBmb2N1c2VkTm9kZSkg eworICAgICAgICAgICAgaWYgKGhpdE5vZGUgPT0gZm9jdXNlZE5vZGUpIHsKICAgICAgICAgICAg ICAgICAvLyBBbHJlYWR5IGZvY3VzZWQgdGV4dCBmaWVsZCB3YXMgY2xpY2tlZCwgbGV0J3MgcmVt ZW1iZXIgdGhpcy4gIElmCiAgICAgICAgICAgICAgICAgLy8gZm9jdXMgaGFzIG5vdCBjaGFuZ2Vk IGFmdGVyIHRoZSBtb3VzZSBldmVudCBpcyBwcm9jZXNzZWQsIHdlJ2xsCiAgICAgICAgICAgICAg ICAgLy8gdHJpZ2dlciB0aGUgYXV0b2NvbXBsZXRlLgpAQCAtOTk0LDM2ICs5OTcsMzYgQEAgYm9v bCBXZWJWaWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JiBpbnB1 dEV2ZW50KQogICAgIGlmIChtX2lnbm9yZUlucHV0RXZlbnRzKQogICAgICAgICByZXR1cm4gdHJ1 ZTsKIAotICAgIGlmIChtX2hhdmVNb3VzZUNhcHR1cmUgJiYgV2ViSW5wdXRFdmVudDo6aXNNb3Vz ZUV2ZW50VHlwZShpbnB1dEV2ZW50LnR5cGUpKSB7CisgICAgaWYgKG1fbW91c2VDYXB0dXJlTm9k ZS5nZXQoKSAmJiBXZWJJbnB1dEV2ZW50Ojppc01vdXNlRXZlbnRUeXBlKGlucHV0RXZlbnQudHlw ZSkpIHsKKyAgICAgICAgLy8gU2F2ZSBtX21vdXNlQ2FwdHVyZU5vZGUgc2luY2UgbW91c2VDYXB0 dXJlTG9zdCgpIHdpbGwgY2xlYXIgaXQuCisgICAgICAgIFJlZlB0cjxOb2RlPiBub2RlID0gbV9t b3VzZUNhcHR1cmVOb2RlOworCiAgICAgICAgIC8vIE5vdCBhbGwgcGxhdGZvcm1zIGNhbGwgbW91 c2VDYXB0dXJlTG9zdCgpIGRpcmVjdGx5LgogICAgICAgICBpZiAoaW5wdXRFdmVudC50eXBlID09 IFdlYklucHV0RXZlbnQ6Ok1vdXNlVXApCiAgICAgICAgICAgICBtb3VzZUNhcHR1cmVMb3N0KCk7 CiAKLSAgICAgICAgTm9kZSogbm9kZSA9IGZvY3VzZWRXZWJDb3JlTm9kZSgpOwotICAgICAgICBp ZiAobm9kZSAmJiBub2RlLT5yZW5kZXJlcigpICYmIG5vZGUtPnJlbmRlcmVyKCktPmlzRW1iZWRk ZWRPYmplY3QoKSkgewotICAgICAgICAgICAgQXRvbWljU3RyaW5nIGV2ZW50VHlwZTsKLSAgICAg ICAgICAgIHN3aXRjaCAoaW5wdXRFdmVudC50eXBlKSB7Ci0gICAgICAgICAgICBjYXNlIFdlYklu cHV0RXZlbnQ6Ok1vdXNlTW92ZToKLSAgICAgICAgICAgICAgICBldmVudFR5cGUgPSBldmVudE5h bWVzKCkubW91c2Vtb3ZlRXZlbnQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICBjYXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlTGVhdmU6Ci0gICAgICAgICAgICAgICAgZXZlbnRU eXBlID0gZXZlbnROYW1lcygpLm1vdXNlb3V0RXZlbnQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlRG93bjoKLSAgICAgICAgICAg ICAgICBldmVudFR5cGUgPSBldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQ7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlVXA6Ci0g ICAgICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1lcygpLm1vdXNldXBFdmVudDsKLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG5v ZGUtPmRpc3BhdGNoTW91c2VFdmVudCgKLSAgICAgICAgICAgICAgICAgIFBsYXRmb3JtTW91c2VF dmVudEJ1aWxkZXIobWFpbkZyYW1lSW1wbCgpLT5mcmFtZVZpZXcoKSwgKnN0YXRpY19jYXN0PGNv bnN0IFdlYk1vdXNlRXZlbnQqPigmaW5wdXRFdmVudCkpLAotICAgICAgICAgICAgICAgICAgZXZl bnRUeXBlKTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBBdG9taWNTdHJpbmcg ZXZlbnRUeXBlOworICAgICAgICBzd2l0Y2ggKGlucHV0RXZlbnQudHlwZSkgeworICAgICAgICBj YXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlTW92ZToKKyAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2 ZW50TmFtZXMoKS5tb3VzZW1vdmVFdmVudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlTGVhdmU6CisgICAgICAgICAgICBldmVudFR5cGUgPSBl dmVudE5hbWVzKCkubW91c2VvdXRFdmVudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlRG93bjoKKyAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2 ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlVXA6CisgICAgICAgICAgICBldmVudFR5cGUgPSBldmVu dE5hbWVzKCkubW91c2V1cEV2ZW50OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1 bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgfQorCisgICAg ICAgIG5vZGUtPmRpc3BhdGNoTW91c2VFdmVudCgKKyAgICAgICAgICAgICAgUGxhdGZvcm1Nb3Vz ZUV2ZW50QnVpbGRlcihtYWluRnJhbWVJbXBsKCktPmZyYW1lVmlldygpLCAqc3RhdGljX2Nhc3Q8 Y29uc3QgV2ViTW91c2VFdmVudCo+KCZpbnB1dEV2ZW50KSksCisgICAgICAgICAgICAgIGV2ZW50 VHlwZSk7CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBSZW1v dmUgbV9jdXJyZW50SW5wdXRFdmVudC4KQEAgLTEwOTAsNyArMTA5Myw3IEBAIGJvb2wgV2ViVmll d0ltcGw6OmhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYgaW5wdXRFdmVudCkK IAogdm9pZCBXZWJWaWV3SW1wbDo6bW91c2VDYXB0dXJlTG9zdCgpCiB7Ci0gICAgbV9oYXZlTW91 c2VDYXB0dXJlID0gZmFsc2U7CisgICAgbV9tb3VzZUNhcHR1cmVOb2RlID0gMDsKIH0KIAogdm9p ZCBXZWJWaWV3SW1wbDo6c2V0Rm9jdXMoYm9vbCBlbmFibGUpCmRpZmYgLS1naXQgYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgKaW5kZXggNTk0YzFlZmJiN2U2Y2E0MTZmMDdiODI1ZDg2ZmJkNDI5ZWI4NzE2My4uNzI3 MzAwNTM5ODZjNDRkMzc1NDYxMjAxNDY0YjM5ZjcyY2E3Y2E3NSAxMDA2NDQKLS0tIGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaApAQCAtNDkyLDcgKzQ5Miw4IEBAIHByaXZhdGU6CiAgICAgTm90aWZpY2F0aW9u UHJlc2VudGVySW1wbCBtX25vdGlmaWNhdGlvblByZXNlbnRlcjsKICNlbmRpZgogCi0gICAgYm9v bCBtX2hhdmVNb3VzZUNhcHR1cmU7CisgICAgLy8gSWYgc2V0LCB0aGUgKHBsdWdpbikgbm9kZSB3 aGljaCBoYXMgbW91c2UgY2FwdHVyZS4KKyAgICBSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9tb3Vz ZUNhcHR1cmVOb2RlOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIE93 blB0cjxXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW0+IG1fbGF5ZXJSZW5kZXJlcjsK 56516 2010-05-19 13:36:16 -0700 2010-05-20 19:52:48 -0700 Patch bug-39375-20100519133615.patch text/plain 6584 viettrungluu ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGUwOTU5NTExMmFmMDJhMDY2MWQ2YzczNmQ3NjYyMmE4NDQ0NjIxMjgu LjZjMzM4NmQ3ZDJjZmEzYTk3MzFhMzJiZWNlMzRkMmUyYzUyMjVhMTYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDEwLTA1LTE5ICBWaWV0LVRydW5nIEx1dSAgPHZpZXR0cnVuZ2x1 dUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW0Nocm9taXVtXSBEb24ndCByZWx5IG9uIGZvY3VzZWQgbm9kZSB0byByb3V0ZSBt b3VzZSBldmVudHMgdG8gcGx1Z2lucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5Mzc1CisgICAgICAgIGh0dHA6Ly9jcmJ1Zy5jb20vNDM5MzUKKwor ICAgICAgICBPbiBtb3VzZSBkb3duLCBkbyBhIGhpdCB0ZXN0IGFuZCBjaGVjayBpZiBhIHBsdWdp biB3YXMgaGl0LiBJZiBzbywgdGhlbgorICAgICAgICBzYXZlIHRoZSBub2RlIGZvciBmdXR1cmUg bW91c2UgZXZlbnRzICh1bnRpbCBtb3VzZSB1cCBvciBjYXB0dXJlIGxvc3QpLgorCisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Oldl YlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlRG93bik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpoYW5kbGVJbnB1dEV2ZW50KToKKyAgICAgICAg KFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlQ2FwdHVyZUxvc3QpOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5oOiBSZW1vdmUgbV9oYXZlTW91c2VDYXB0dXJlOyBhZGQgbV9tb3VzZUNhcHR1 cmVOb2RlLgorCiAyMDEwLTA1LTEyICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAppbmRleCA5NGNmMzZjNDI3ZDBmMDlkY2QzNzc0ODc4MmYzOWY0NjdlZWNlYTky Li42MzkxMmFjNjdmOGRlYTdiNzA5ODUxY2QxY2FlODdkY2EyYThmZmYyIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMjM5LDcgKzIzOSw2IEBAIFdlYlZpZXdJbXBsOjpXZWJW aWV3SW1wbChXZWJWaWV3Q2xpZW50KiBjbGllbnQpCiAgICAgLCBtX3N1Z2dlc3Rpb25zUG9wdXAo MCkKICAgICAsIG1faXNUcmFuc3BhcmVudChmYWxzZSkKICAgICAsIG1fdGFic1RvTGlua3MoZmFs c2UpCi0gICAgLCBtX2hhdmVNb3VzZUNhcHR1cmUoZmFsc2UpCiAjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQogICAgICwgbV9sYXllclJlbmRlcmVyKDApCiAgICAgLCBtX2lzQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShmYWxzZSkKQEAgLTMzNywxOSArMzM2LDIzIEBAIHZvaWQg V2ViVmlld0ltcGw6Om1vdXNlRG93bihjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKICAgICB9 CiAKICAgICBtX2xhc3RNb3VzZURvd25Qb2ludCA9IFdlYlBvaW50KGV2ZW50LngsIGV2ZW50Lnkp OwotICAgIG1faGF2ZU1vdXNlQ2FwdHVyZSA9IHRydWU7CiAKLSAgICAvLyBJZiBhIHRleHQgZmll bGQgdGhhdCBoYXMgZm9jdXMgaXMgY2xpY2tlZCBhZ2Fpbiwgd2Ugc2hvdWxkIGRpc3BsYXkgdGhl Ci0gICAgLy8gc3VnZ2VzdGlvbnMgcG9wdXAuCiAgICAgUmVmUHRyPE5vZGU+IGNsaWNrZWROb2Rl OwogICAgIGlmIChldmVudC5idXR0b24gPT0gV2ViTW91c2VFdmVudDo6QnV0dG9uTGVmdCkgewor ICAgICAgICBJbnRQb2ludCBwb2ludChldmVudC54LCBldmVudC55KTsKKyAgICAgICAgcG9pbnQg PSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPndpbmRvd1RvQ29udGVudHMocG9pbnQpOwor ICAgICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdChtX3BhZ2UtPm1haW5GcmFtZSgpLT5ldmVudEhh bmRsZXIoKS0+aGl0VGVzdFJlc3VsdEF0UG9pbnQocG9pbnQsIGZhbHNlKSk7CisgICAgICAgIE5v ZGUqIGhpdE5vZGUgPSByZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCk7CisKKyAgICAgICAgLy8g VGFrZSBjYXB0dXJlIG9uIGEgbW91c2UgZG93biBvbiBhIHBsdWdpbiBzbyB3ZSBjYW4gc2VuZCBp dCBtb3VzZSBldmVudHMuCisgICAgICAgIGlmIChoaXROb2RlICYmIGhpdE5vZGUtPnJlbmRlcmVy KCkgJiYgaGl0Tm9kZS0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVjdCgpKQorICAgICAgICAg ICAgbV9tb3VzZUNhcHR1cmVOb2RlID0gaGl0Tm9kZTsKKworICAgICAgICAvLyBJZiBhIHRleHQg ZmllbGQgdGhhdCBoYXMgZm9jdXMgaXMgY2xpY2tlZCBhZ2Fpbiwgd2Ugc2hvdWxkIGRpc3BsYXkg dGhlCisgICAgICAgIC8vIHN1Z2dlc3Rpb25zIHBvcHVwLgogICAgICAgICBSZWZQdHI8Tm9kZT4g Zm9jdXNlZE5vZGUgPSBmb2N1c2VkV2ViQ29yZU5vZGUoKTsKICAgICAgICAgaWYgKGZvY3VzZWRO b2RlLmdldCgpICYmIHRvSFRNTElucHV0RWxlbWVudChmb2N1c2VkTm9kZS5nZXQoKSkpIHsKLSAg ICAgICAgICAgIEludFBvaW50IHBvaW50KGV2ZW50LngsIGV2ZW50LnkpOwotICAgICAgICAgICAg cG9pbnQgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPndpbmRvd1RvQ29udGVudHMocG9p bnQpOwotICAgICAgICAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQocG9pbnQpOwotICAgICAgICAg ICAgcmVzdWx0ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhpdFRlc3RS ZXN1bHRBdFBvaW50KHBvaW50LCBmYWxzZSk7Ci0gICAgICAgICAgICBpZiAocmVzdWx0LmlubmVy Tm9uU2hhcmVkTm9kZSgpID09IGZvY3VzZWROb2RlKSB7CisgICAgICAgICAgICBpZiAoaGl0Tm9k ZSA9PSBmb2N1c2VkTm9kZSkgewogICAgICAgICAgICAgICAgIC8vIEFscmVhZHkgZm9jdXNlZCB0 ZXh0IGZpZWxkIHdhcyBjbGlja2VkLCBsZXQncyByZW1lbWJlciB0aGlzLiAgSWYKICAgICAgICAg ICAgICAgICAvLyBmb2N1cyBoYXMgbm90IGNoYW5nZWQgYWZ0ZXIgdGhlIG1vdXNlIGV2ZW50IGlz IHByb2Nlc3NlZCwgd2UnbGwKICAgICAgICAgICAgICAgICAvLyB0cmlnZ2VyIHRoZSBhdXRvY29t cGxldGUuCkBAIC05OTQsMzYgKzk5NywzNiBAQCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVJbnB1 dEV2ZW50KGNvbnN0IFdlYklucHV0RXZlbnQmIGlucHV0RXZlbnQpCiAgICAgaWYgKG1faWdub3Jl SW5wdXRFdmVudHMpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKG1faGF2ZU1vdXNl Q2FwdHVyZSAmJiBXZWJJbnB1dEV2ZW50Ojppc01vdXNlRXZlbnRUeXBlKGlucHV0RXZlbnQudHlw ZSkpIHsKKyAgICBpZiAobV9tb3VzZUNhcHR1cmVOb2RlLmdldCgpICYmIFdlYklucHV0RXZlbnQ6 OmlzTW91c2VFdmVudFR5cGUoaW5wdXRFdmVudC50eXBlKSkgeworICAgICAgICAvLyBTYXZlIG1f bW91c2VDYXB0dXJlTm9kZSBzaW5jZSBtb3VzZUNhcHR1cmVMb3N0KCkgd2lsbCBjbGVhciBpdC4K KyAgICAgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBtX21vdXNlQ2FwdHVyZU5vZGU7CisKICAgICAg ICAgLy8gTm90IGFsbCBwbGF0Zm9ybXMgY2FsbCBtb3VzZUNhcHR1cmVMb3N0KCkgZGlyZWN0bHku CiAgICAgICAgIGlmIChpbnB1dEV2ZW50LnR5cGUgPT0gV2ViSW5wdXRFdmVudDo6TW91c2VVcCkK ICAgICAgICAgICAgIG1vdXNlQ2FwdHVyZUxvc3QoKTsKIAotICAgICAgICBOb2RlKiBub2RlID0g Zm9jdXNlZFdlYkNvcmVOb2RlKCk7Ci0gICAgICAgIGlmIChub2RlICYmIG5vZGUtPnJlbmRlcmVy KCkgJiYgbm9kZS0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVjdCgpKSB7Ci0gICAgICAgICAg ICBBdG9taWNTdHJpbmcgZXZlbnRUeXBlOwotICAgICAgICAgICAgc3dpdGNoIChpbnB1dEV2ZW50 LnR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VNb3ZlOgotICAg ICAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFtZXMoKS5tb3VzZW1vdmVFdmVudDsKLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91 c2VMZWF2ZToKLSAgICAgICAgICAgICAgICBldmVudFR5cGUgPSBldmVudE5hbWVzKCkubW91c2Vv dXRFdmVudDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5w dXRFdmVudDo6TW91c2VEb3duOgotICAgICAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFt ZXMoKS5tb3VzZWRvd25FdmVudDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg IGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VVcDoKLSAgICAgICAgICAgICAgICBldmVudFR5cGUg PSBldmVudE5hbWVzKCkubW91c2V1cEV2ZW50OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgbm9kZS0+ZGlzcGF0Y2hNb3VzZUV2ZW50KAot ICAgICAgICAgICAgICAgICAgUGxhdGZvcm1Nb3VzZUV2ZW50QnVpbGRlcihtYWluRnJhbWVJbXBs KCktPmZyYW1lVmlldygpLCAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VFdmVudCo+KCZpbnB1 dEV2ZW50KSksCi0gICAgICAgICAgICAgICAgICBldmVudFR5cGUpOwotICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIEF0b21pY1N0cmluZyBldmVudFR5cGU7CisgICAgICAgIHN3aXRj aCAoaW5wdXRFdmVudC50eXBlKSB7CisgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VN b3ZlOgorICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50 OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VM ZWF2ZToKKyAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFtZXMoKS5tb3VzZW91dEV2ZW50 OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VE b3duOgorICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50 OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VV cDoKKyAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQ7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgICAgICB9CisKKyAgICAgICAgbm9kZS0+ZGlzcGF0Y2hNb3VzZUV2 ZW50KAorICAgICAgICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnRCdWlsZGVyKG1haW5GcmFtZUlt cGwoKS0+ZnJhbWVWaWV3KCksICpzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZUV2ZW50Kj4oJmlu cHV0RXZlbnQpKSwKKyAgICAgICAgICAgICAgZXZlbnRUeXBlKTsKKyAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgfQogCiAgICAgLy8gRklYTUU6IFJlbW92ZSBtX2N1cnJlbnRJbnB1dEV2ZW50LgpA QCAtMTA5MCw3ICsxMDkzLDcgQEAgYm9vbCBXZWJWaWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudChj b25zdCBXZWJJbnB1dEV2ZW50JiBpbnB1dEV2ZW50KQogCiB2b2lkIFdlYlZpZXdJbXBsOjptb3Vz ZUNhcHR1cmVMb3N0KCkKIHsKLSAgICBtX2hhdmVNb3VzZUNhcHR1cmUgPSBmYWxzZTsKKyAgICBt X21vdXNlQ2FwdHVyZU5vZGUgPSAwOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRGb2N1cyhi b29sIGVuYWJsZSkKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA1OTRjMWVmYmI3ZTZj YTQxNmYwN2I4MjVkODZmYmQ0MjllYjg3MTYzLi43MjczMDA1Mzk4NmM0NGQzNzU0NjEyMDE0NjRi MzlmNzJjYTdjYTc1IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC00OTIsNyArNDky LDggQEAgcHJpdmF0ZToKICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsIG1fbm90aWZpY2F0 aW9uUHJlc2VudGVyOwogI2VuZGlmCiAKLSAgICBib29sIG1faGF2ZU1vdXNlQ2FwdHVyZTsKKyAg ICAvLyBJZiBzZXQsIHRoZSAocGx1Z2luKSBub2RlIHdoaWNoIGhhcyBtb3VzZSBjYXB0dXJlLgor ICAgIFJlZlB0cjxXZWJDb3JlOjpOb2RlPiBtX21vdXNlQ2FwdHVyZU5vZGU7CiAKICNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgT3duUHRyPFdlYkNvcmU6OkxheWVyUmVuZGVy ZXJDaHJvbWl1bT4gbV9sYXllclJlbmRlcmVyOwo=