79256 2012-02-22 10:30:07 -0800 [BlackBerry] Fat fingers - Add a clearer way to distinguish the node we want (shadow or non-shadow) 2012-02-23 20:28:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74380 1 tonikitoo tonikitoo oldest_to_newest 562119 0 tonikitoo 2012-02-22 10:30:07 -0800 FatFingers works with both shadow and non-shadow content for accuracy. There are cases that we are dealing with the FatFingersResult class, but want to restrict operate non-shadow DOM content (for example when checking if it has JS listeners attached to it, doing some text selection stuff, or checking context menu info off of the target node).For other cases, we do not actually care. Patch provides cleaner way to get the target we intend to, depending on the situation. 562171 1 128251 tonikitoo 2012-02-22 11:14:55 -0800 Created attachment 128251 (landed r108721, r=rbuis) patch v1 562198 2 128251 rwlbuis 2012-02-22 11:43:33 -0800 Comment on attachment 128251 (landed r108721, r=rbuis) patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=128251&action=review Looks good with some stuff to fix before landing. > Source/WebKit/blackberry/WebKitSupport/FatFingers.h:51 > +enum ContentType { ShadowContentAllowed, ShadowContentNotAllowed }; Better move it into FatFingersResult class before landing. > Source/WebKit/blackberry/WebKitSupport/FatFingers.h:96 > + } Not sure if this makes sense inlined, might need measurements, not required for landing this though. 128251 2012-02-22 11:14:55 -0800 2012-02-23 20:28:43 -0800 (landed r108721, r=rbuis) patch v1 0001-2012-02-19-Antonio-Gomes-agomes-rim.com.patch text/plain 10865 tonikitoo RnJvbSA1ODQzMTA5Y2RmMDNjYWJhNzhmODE0ODJlYzA0MzMzMTRhOGM4Zjk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog U3VuLCAxOSBGZWIgMjAxMiAyMzoyMTowNiAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDIt MTkgIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KCiAgICAgICAgRmF0IGZpbmdlcnMg LSBBZGQgYSBjbGVhcmVyIHdheSB0byBkaXN0aW5ndWlzaCB0aGUgbm9kZSB3ZSB3YW50IChzaGFk b3cgb3Igbm9uLXNoYWRvdykKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzkyNTYKICAgICAgICBQUiAjMTI3ODE0IC8gTUtTXzI1ODc0MTAKCiAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFBhdGNoIGFkZHMgYSBjbGVhbmVy IHdheSBmb3IgY2FsbCBzaXRlcyBvZiBGYXRGaW5nZXJzUmVzdWx0IHRvCiAgICAgICAgcXVlcnkg Zm9yIHRoZSBhcHByb3ByaWF0ZWQgdGFyZ2V0IG5vZGU6IHNoYWRvdyBvciBub24tc2hhZG93IERP TSBub2Rlcy4KCiAgICAgICAgSXQgYWxzbyByZW5hbWVzIEZhdEZpbmdlcnNSZXN1bHRzOjp2YWxp ZE5vZGUgdG8gOjpub2RlLCBhc3N1bWluZwogICAgICAgIHRoYXQgImludmFsaWQiIG5vZGVzIGFy ZSBub3QgYXBwbGljYWJsZSBpbiBhbnkgY29udGV4dC4KCiAgICAgICAgKiBBcGkvV2ViUGFnZS5j cHA6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmNsZWFyRG9j dW1lbnREYXRhKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6 Y29udGV4dE5vZGUpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRl OjpoYW5kbGVNb3VzZUV2ZW50KToKICAgICAgICAqIFdlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5o OgogICAgICAgIChGYXRGaW5nZXJzUmVzdWx0KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpGYXRGaW5nZXJzUmVzdWx0Ojpub2RlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpG YXRGaW5nZXJzUmVzdWx0Ojpub2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKToKICAgICAgICAqIFdl YktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHA6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0QXRQb2ludCk6CiAgICAgICAgKiBXZWJLaXRT dXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpUb3VjaEV2ZW50SGFuZGxlcjo6dG91Y2hIb2xkRXZlbnQpOgogICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OlRvdWNoRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KToKLS0tCiBTb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwICAgICAgICAgICB8ICAgIDkgKyst LS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwg ICAyOCArKysrKysrKysrKysrKysrKysKIC4uLi9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0ZhdEZpbmdlcnMuaCAgIHwgICAzMCArKysrKysrKysrKysrKysrKystLQogLi4uL2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCAgfCAgICA0ICstCiAuLi4v YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcCB8ICAgIDggKyst LQogNSBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCBlMTUzZWE1Li4yZmE0 ZTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTIxMDQs NyArMjEwNCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmNsZWFyRG9jdW1lbnREYXRhKGNvbnN0 IERvY3VtZW50KiBkb2N1bWVudEdvaW5nQXdheSkKICAgICBpZiAobV9pblJlZ2lvblNjcm9sbFN0 YXJ0aW5nTm9kZSAmJiBtX2luUmVnaW9uU2Nyb2xsU3RhcnRpbmdOb2RlLT5kb2N1bWVudCgpID09 IGRvY3VtZW50R29pbmdBd2F5KQogICAgICAgICBtX2luUmVnaW9uU2Nyb2xsU3RhcnRpbmdOb2Rl ID0gMDsKIAotICAgIE5vZGUqIG5vZGVVbmRlckZhdEZpbmdlciA9IG1fdG91Y2hFdmVudEhhbmRs ZXItPmxhc3RGYXRGaW5nZXJzUmVzdWx0KCkudmFsaWROb2RlKCk7CisgICAgTm9kZSogbm9kZVVu ZGVyRmF0RmluZ2VyID0gbV90b3VjaEV2ZW50SGFuZGxlci0+bGFzdEZhdEZpbmdlcnNSZXN1bHQo KS5ub2RlKCk7CiAgICAgaWYgKG5vZGVVbmRlckZhdEZpbmdlciAmJiBub2RlVW5kZXJGYXRGaW5n ZXItPmRvY3VtZW50KCkgPT0gZG9jdW1lbnRHb2luZ0F3YXkpCiAgICAgICAgIG1fdG91Y2hFdmVu dEhhbmRsZXItPnJlc2V0TGFzdEZhdEZpbmdlcnNSZXN1bHQoKTsKIApAQCAtMjUyMCw3ICsyNTIw LDcgQEAgUGFzc1JlZlB0cjxOb2RlPiBXZWJQYWdlUHJpdmF0ZTo6Y29udGV4dE5vZGUoVGFyZ2V0 RGV0ZWN0aW9uU3RyYXRlZ3kgc3RyYXRlZ3kpCiAKICAgICAvLyBDaGVjayBmb3IgdGV4dCBpbnB1 dC4KICAgICBpZiAoaXNUb3VjaGluZyAmJiBsYXN0RmF0RmluZ2Vyc1Jlc3VsdC5pc1RleHRJbnB1 dCgpKQotICAgICAgICByZXR1cm4gbGFzdEZhdEZpbmdlcnNSZXN1bHQudmFsaWROb2RlKCk7Cisg ICAgICAgIHJldHVybiBsYXN0RmF0RmluZ2Vyc1Jlc3VsdC5ub2RlKFNoYWRvd0NvbnRlbnROb3RB bGxvd2VkKTsKIAogICAgIEludFBvaW50IGNvbnRlbnRQb3M7CiAgICAgaWYgKGlzVG91Y2hpbmcp CkBAIC0yNTMwLDcgKzI1MzAsNyBAQCBQYXNzUmVmUHRyPE5vZGU+IFdlYlBhZ2VQcml2YXRlOjpj b250ZXh0Tm9kZShUYXJnZXREZXRlY3Rpb25TdHJhdGVneSBzdHJhdGVneSkKIAogICAgIGlmIChz dHJhdGVneSA9PSBSZWN0QmFzZWQpIHsKICAgICAgICAgRmF0RmluZ2Vyc1Jlc3VsdCByZXN1bHQg PSBGYXRGaW5nZXJzKHRoaXMsIGxhc3RGYXRGaW5nZXJzUmVzdWx0LmFkanVzdGVkUG9zaXRpb24o KSwgRmF0RmluZ2Vyczo6VGV4dCkuZmluZEJlc3RQb2ludCgpOwotICAgICAgICByZXR1cm4gcmVz dWx0LnZhbGlkTm9kZSgpOworICAgICAgICByZXR1cm4gcmVzdWx0Lm5vZGUoU2hhZG93Q29udGVu dE5vdEFsbG93ZWQpOwogICAgIH0KIAogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gZXZlbnRI YW5kbGVyLT5oaXRUZXN0UmVzdWx0QXRQb2ludChjb250ZW50UG9zLCBmYWxzZSAvKmFsbG93U2hh ZG93Q29udGVudCovKTsKQEAgLTM3MjMsOCArMzcyMyw3IEBAIGJvb2wgV2ViUGFnZVByaXZhdGU6 OmhhbmRsZU1vdXNlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50JiBtb3VzZUV2ZW50KQogICAgICAg ICBjb25zdCBGYXRGaW5nZXJzUmVzdWx0IGxhc3RGYXRGaW5nZXJzUmVzdWx0ID0gbV90b3VjaEV2 ZW50SGFuZGxlci0+bGFzdEZhdEZpbmdlcnNSZXN1bHQoKTsKIAogICAgICAgICAvLyBGYXQgZmlu Z2VycyBjYW4gZGVhbCB3aXRoIHNoYWRvdyBjb250ZW50LgotICAgICAgICBpZiAobm9kZSA9IGxh c3RGYXRGaW5nZXJzUmVzdWx0LnZhbGlkTm9kZSgpKQotICAgICAgICAgICAgbm9kZSA9IG5vZGUt PnNoYWRvd0FuY2VzdG9yTm9kZSgpOworICAgICAgICBub2RlID0gbGFzdEZhdEZpbmdlcnNSZXN1 bHQubm9kZShTaGFkb3dDb250ZW50Tm90QWxsb3dlZCk7CiAgICAgfQogCiAgICAgaWYgKCFub2Rl KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAxODI1MzAwLi4yNTI1MzFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMi0wMi0x OSAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgorCisgICAgICAgIEZhdCBmaW5nZXJz IC0gQWRkIGEgY2xlYXJlciB3YXkgdG8gZGlzdGluZ3Vpc2ggdGhlIG5vZGUgd2Ugd2FudCAoc2hh ZG93IG9yIG5vbi1zaGFkb3cpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03OTI1NgorICAgICAgICBQUiAjMTI3ODE0IC8gTUtTXzI1ODc0MTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBhZGRzIGEg Y2xlYW5lciB3YXkgZm9yIGNhbGwgc2l0ZXMgb2YgRmF0RmluZ2Vyc1Jlc3VsdCB0bworICAgICAg ICBxdWVyeSBmb3IgdGhlIGFwcHJvcHJpYXRlZCB0YXJnZXQgbm9kZTogc2hhZG93IG9yIG5vbi1z aGFkb3cgRE9NIG5vZGVzLgorCisgICAgICAgIEl0IGFsc28gcmVuYW1lcyBGYXRGaW5nZXJzUmVz dWx0czo6dmFsaWROb2RlIHRvIDo6bm9kZSwgYXNzdW1pbmcKKyAgICAgICAgdGhhdCAiaW52YWxp ZCIgbm9kZXMgYXJlIG5vdCBhcHBsaWNhYmxlIGluIGFueSBjb250ZXh0LgorCisgICAgICAgICog QXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJp dmF0ZTo6Y2xlYXJEb2N1bWVudERhdGEpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpX ZWJQYWdlUHJpdmF0ZTo6Y29udGV4dE5vZGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpXZWJQYWdlUHJpdmF0ZTo6aGFuZGxlTW91c2VFdmVudCk6CisgICAgICAgICogV2ViS2l0U3Vw cG9ydC9GYXRGaW5nZXJzLmg6CisgICAgICAgIChGYXRGaW5nZXJzUmVzdWx0KToKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyc1Jlc3VsdDo6bm9kZSk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnNSZXN1bHQ6Om5vZGVBc0VsZW1lbnRJZkFwcGxp Y2FibGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHA6Cisg ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdEF0UG9p bnQpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvVG91Y2hFdmVudEhhbmRsZXIuY3BwOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpUb3VjaEV2ZW50SGFuZGxlcjo6dG91Y2hIb2xkRXZl bnQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpUb3VjaEV2ZW50SGFuZGxlcjo6aGFu ZGxlVG91Y2hQb2ludCk6CisKIDIwMTItMDItMTggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmlt LmNvbT4KIAogICAgICAgICBGYXQgZmluZ2VycyAtIGNhY2hlIHRoZSBmaXJzdCByZWN0LWJhc2Vk IGhpdCB0ZXN0IHNvIHdlIGRvIG5vdCBuZWVkIHRvIGRvIGl0IGFnYWluCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmgKaW5kZXggNmI4 NDdlMS4uOWFmOGIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvRmF0RmluZ2Vycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0ZhdEZpbmdlcnMuaApAQCAtNDgsOCArNDgsMTEgQEAgY2xhc3MgV2ViUGFnZVBy aXZhdGU7CiBjbGFzcyBGYXRGaW5nZXJzOwogY2xhc3MgVG91Y2hFdmVudEhhbmRsZXI7CiAKK2Vu dW0gQ29udGVudFR5cGUgeyBTaGFkb3dDb250ZW50QWxsb3dlZCwgU2hhZG93Q29udGVudE5vdEFs bG93ZWQgfTsKKwogY2xhc3MgRmF0RmluZ2Vyc1Jlc3VsdCB7CiBwdWJsaWM6CisKICAgICBGYXRG aW5nZXJzUmVzdWx0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwID0gV2ViQ29yZTo6SW50UG9p bnQ6Onplcm8oKSkKICAgICAgICAgOiBtX29yaWdpbmFsUG9zaXRpb24ocCkKICAgICAgICAgLCBt X2FkanVzdGVkUG9zaXRpb24ocCkKQEAgLTc0LDEwICs3NywzMSBAQCBwdWJsaWM6CiAgICAgYm9v bCBwb3NpdGlvbldhc0FkanVzdGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc1ZhbGlkICYmIG1fcG9z aXRpb25XYXNBZGp1c3RlZDsgfQogICAgIGJvb2wgaXNUZXh0SW5wdXQoKSBjb25zdCB7IHJldHVy biBtX2lzVmFsaWQgJiYgISFtX25vZGVVbmRlckZhdEZpbmdlciAmJiBtX2lzVGV4dElucHV0OyB9 CiAgICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9pc1ZhbGlkOyB9Ci0gICAgV2Vi Q29yZTo6Tm9kZSogdmFsaWROb2RlKCkgY29uc3QgeyByZXR1cm4gbV9ub2RlVW5kZXJGYXRGaW5n ZXIgJiYgbV9ub2RlVW5kZXJGYXRGaW5nZXItPmluRG9jdW1lbnQoKSA/IG1fbm9kZVVuZGVyRmF0 RmluZ2VyLmdldCgpIDogMDsgfQotICAgIFdlYkNvcmU6OkVsZW1lbnQqIG5vZGVBc0VsZW1lbnRJ ZkFwcGxpY2FibGUoKSBjb25zdAorCisgICAgV2ViQ29yZTo6Tm9kZSogbm9kZShDb250ZW50VHlw ZSB0eXBlID0gU2hhZG93Q29udGVudEFsbG93ZWQpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6RWxlbWVudCo+KG1fbm9kZVVuZGVyRmF0RmluZ2VyICYm IG1fbm9kZVVuZGVyRmF0RmluZ2VyLT5pbkRvY3VtZW50KCkgJiYgbV9ub2RlVW5kZXJGYXRGaW5n ZXItPmlzRWxlbWVudE5vZGUoKSA/IG1fbm9kZVVuZGVyRmF0RmluZ2VyLmdldCgpIDogMCk7Cisg ICAgICAgIGlmICghbV9ub2RlVW5kZXJGYXRGaW5nZXIgfHwgIW1fbm9kZVVuZGVyRmF0RmluZ2Vy LT5pbkRvY3VtZW50KCkpCisgICAgICAgICAgICByZXR1cm4gMDsKKworICAgICAgICBXZWJDb3Jl OjpOb2RlKiByZXN1bHQgPSBtX25vZGVVbmRlckZhdEZpbmdlci5nZXQoKTsKKworICAgICAgICBp ZiAodHlwZSA9PSBTaGFkb3dDb250ZW50QWxsb3dlZCkKKyAgICAgICAgICAgIHJldHVybiByZXN1 bHQ7CisKKyAgICAgICAgLy8gU2hhZG93IHRyZWVzIGNhbiBiZSBuZXN0ZWQuCisgICAgICAgIHdo aWxlIChyZXN1bHQtPmlzSW5TaGFkb3dUcmVlKCkpCisgICAgICAgICAgICByZXN1bHQgPSB0b0Vs ZW1lbnQocmVzdWx0LT5zaGFkb3dBbmNlc3Rvck5vZGUoKSk7CisKKyAgICAgICAgcmV0dXJuIHJl c3VsdDsKKyAgICB9CisKKyAgICBXZWJDb3JlOjpFbGVtZW50KiBub2RlQXNFbGVtZW50SWZBcHBs aWNhYmxlKENvbnRlbnRUeXBlIHR5cGUgPSBTaGFkb3dDb250ZW50QWxsb3dlZCkgY29uc3QKKyAg ICB7CisgICAgICAgIFdlYkNvcmU6Ok5vZGUqIHJlc3VsdCA9IG5vZGUodHlwZSk7CisgICAgICAg IGlmICghcmVzdWx0IHx8ICFyZXN1bHQtPmlzRWxlbWVudE5vZGUoKSkKKyAgICAgICAgICAgIHJl dHVybiAwOworCisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJDb3JlOjpFbGVtZW50Kj4o cmVzdWx0KTsKICAgICB9CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCmluZGV4IGFi MmRkZjguLjBlZjFlMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCkBAIC01MzcsNyArNTM3LDcg QEAgdm9pZCBTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3RBdFBvaW50KGNvbnN0IEludFBvaW50JiBs b2NhdGlvbikKICAgICAvLyBGSVhNRTogRmFjdG9yeSB0aGlzIGdldCByaWdodCBmYXQgZmluZ2Vy IGNvZGUgaW50byBhIGhlbHBlci4KICAgICBjb25zdCBGYXRGaW5nZXJzUmVzdWx0IGxhc3RGYXRG aW5nZXJzUmVzdWx0ID0gbV93ZWJQYWdlLT5tX3RvdWNoRXZlbnRIYW5kbGVyLT5sYXN0RmF0Rmlu Z2Vyc1Jlc3VsdCgpOwogICAgIGlmIChsYXN0RmF0RmluZ2Vyc1Jlc3VsdC5wb3NpdGlvbldhc0Fk anVzdGVkKCkgJiYgbGFzdEZhdEZpbmdlcnNSZXN1bHQubm9kZUFzRWxlbWVudElmQXBwbGljYWJs ZSgpKSB7Ci0gICAgICAgIHRhcmdldE5vZGUgPSBsYXN0RmF0RmluZ2Vyc1Jlc3VsdC52YWxpZE5v ZGUoKTsKKyAgICAgICAgdGFyZ2V0Tm9kZSA9IGxhc3RGYXRGaW5nZXJzUmVzdWx0Lm5vZGUoU2hh ZG93Q29udGVudE5vdEFsbG93ZWQpOwogICAgICAgICB0YXJnZXRQb3NpdGlvbiA9IGxhc3RGYXRG aW5nZXJzUmVzdWx0LmFkanVzdGVkUG9zaXRpb24oKTsKICAgICB9IGVsc2UgewogICAgICAgICBG YXRGaW5nZXJzUmVzdWx0IG5ld0ZhdEZpbmdlcnNSZXN1bHQgPSBGYXRGaW5nZXJzKG1fd2ViUGFn ZSwgbG9jYXRpb24sIEZhdEZpbmdlcnM6OlRleHQpLmZpbmRCZXN0UG9pbnQoKTsKQEAgLTU0NSw3 ICs1NDUsNyBAQCB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdEF0UG9pbnQoY29uc3QgSW50 UG9pbnQmIGxvY2F0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRhcmdldFBv c2l0aW9uID0gbmV3RmF0RmluZ2Vyc1Jlc3VsdC5hZGp1c3RlZFBvc2l0aW9uKCk7Ci0gICAgICAg IHRhcmdldE5vZGUgPSBuZXdGYXRGaW5nZXJzUmVzdWx0LnZhbGlkTm9kZSgpOworICAgICAgICB0 YXJnZXROb2RlID0gbmV3RmF0RmluZ2Vyc1Jlc3VsdC5ub2RlKFNoYWRvd0NvbnRlbnROb3RBbGxv d2VkKTsKICAgICB9CiAKICAgICBBU1NFUlQodGFyZ2V0Tm9kZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxl ci5jcHAKaW5kZXggYmI2M2IyYi4uNDI3M2YyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91Y2hFdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcApA QCAtMTY4LDcgKzE2OCw3IEBAIHZvaWQgVG91Y2hFdmVudEhhbmRsZXI6OnRvdWNoSG9sZEV2ZW50 KCkKICAgICAgICAgaGFuZGxlRmF0RmluZ2VyUHJlc3NlZCgpOwogCiAgICAgLy8gQ2xlYXIgdGhl IGZvY3VzIHJpbmcgaW5kaWNhdGlvbiBpZiB0YXAtYW5kLWhvbGQnaW5nIG9uIGEgbGluay4KLSAg ICBpZiAobV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC52YWxpZE5vZGUoKSAmJiBtX2xhc3RGYXRGaW5n ZXJzUmVzdWx0LnZhbGlkTm9kZSgpLT5pc0xpbmsoKSkKKyAgICBpZiAobV9sYXN0RmF0RmluZ2Vy c1Jlc3VsdC5ub2RlKCkgJiYgbV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC5ub2RlKCktPmlzTGluaygp KQogICAgICAgICBtX3dlYlBhZ2UtPmNsZWFyRm9jdXNOb2RlKCk7CiB9CiAKQEAgLTE4NiwxMyAr MTg2LDEzIEBAIGJvb2wgVG91Y2hFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoUG9pbnQoUGxhdGZv cm06OlRvdWNoUG9pbnQmIHBvaW50KQogICAgICAgICAgICAgbV9sYXN0RmF0RmluZ2Vyc1Jlc3Vs dCA9IEZhdEZpbmdlcnMobV93ZWJQYWdlLCBjb250ZW50UG9zLCBGYXRGaW5nZXJzOjpDbGlja2Fi bGVFbGVtZW50KS5maW5kQmVzdFBvaW50KCk7CiAKICAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1l bnRVbmRlckZhdEZpbmdlciA9IDA7Ci0gICAgICAgICAgICBpZiAobV9sYXN0RmF0RmluZ2Vyc1Jl c3VsdC5wb3NpdGlvbldhc0FkanVzdGVkKCkgJiYgbV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC52YWxp ZE5vZGUoKSkgewotICAgICAgICAgICAgICAgIEFTU0VSVChtX2xhc3RGYXRGaW5nZXJzUmVzdWx0 LnZhbGlkTm9kZSgpLT5pc0VsZW1lbnROb2RlKCkpOworICAgICAgICAgICAgaWYgKG1fbGFzdEZh dEZpbmdlcnNSZXN1bHQucG9zaXRpb25XYXNBZGp1c3RlZCgpICYmIG1fbGFzdEZhdEZpbmdlcnNS ZXN1bHQubm9kZSgpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKG1fbGFzdEZhdEZpbmdlcnNS ZXN1bHQubm9kZSgpLT5pc0VsZW1lbnROb2RlKCkpOwogICAgICAgICAgICAgICAgIGVsZW1lbnRV bmRlckZhdEZpbmdlciA9IG1fbGFzdEZhdEZpbmdlcnNSZXN1bHQubm9kZUFzRWxlbWVudElmQXBw bGljYWJsZSgpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBTZXQgb3IgcmVzZXQg dGhlIHRvdWNoIG1vZGUuCi0gICAgICAgICAgICBFbGVtZW50KiBwb3NzaWJsZVRhcmdldE5vZGVG b3JNb3VzZU1vdmVFdmVudHMgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obV9sYXN0RmF0RmluZ2Vy c1Jlc3VsdC5wb3NpdGlvbldhc0FkanVzdGVkKCkgPyBlbGVtZW50VW5kZXJGYXRGaW5nZXIgOiBt X2xhc3RGYXRGaW5nZXJzUmVzdWx0LnZhbGlkTm9kZSgpKTsKKyAgICAgICAgICAgIEVsZW1lbnQq IHBvc3NpYmxlVGFyZ2V0Tm9kZUZvck1vdXNlTW92ZUV2ZW50cyA9IHN0YXRpY19jYXN0PEVsZW1l bnQqPihtX2xhc3RGYXRGaW5nZXJzUmVzdWx0LnBvc2l0aW9uV2FzQWRqdXN0ZWQoKSA/IGVsZW1l bnRVbmRlckZhdEZpbmdlciA6IG1fbGFzdEZhdEZpbmdlcnNSZXN1bHQubm9kZSgpKTsKICAgICAg ICAgICAgIG1fY29udmVydFRvdWNoVG9Nb3VzZSA9IHNob3VsZENvbnZlcnRUb3VjaFRvTW91c2Uo cG9zc2libGVUYXJnZXROb2RlRm9yTW91c2VNb3ZlRXZlbnRzKTsKIAogICAgICAgICAgICAgaWYg KGVsZW1lbnRVbmRlckZhdEZpbmdlcikKLS0gCjEuNy4xCgo=