80984 2012-03-13 06:56:26 -0700 Remove ActiveNodeContext in favour of BlackBerry::Platform::WebContext 2012-03-13 08:03:11 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 mlattanzio webkit-unassigned tonikitoo webkit.review.bot oldest_to_newest 577273 0 mlattanzio 2012-03-13 06:56:26 -0700 Remove the Source/WebKit/blackberry/Api/ActiveNodeContext class, and switch to BlackBerry::Platform::WebContext. This will allow us to expose a menu context object to applications embedding WebKit more easily in the future. 577282 1 131606 mlattanzio 2012-03-13 07:10:17 -0700 Created attachment 131606 Replace ActiveNodeContext with WebContext. Add support for IsAudio and IsVideo 577318 2 131606 webkit.review.bot 2012-03-13 08:03:04 -0700 Comment on attachment 131606 Replace ActiveNodeContext with WebContext. Add support for IsAudio and IsVideo Clearing flags on attachment: 131606 Committed r110562: <http://trac.webkit.org/changeset/110562> 577319 3 webkit.review.bot 2012-03-13 08:03:11 -0700 All reviewed patches have been landed. Closing bug. 131606 2012-03-13 07:10:17 -0700 2012-03-13 08:03:04 -0700 Replace ActiveNodeContext with WebContext. Add support for IsAudio and IsVideo 0001-2012-03-12-Mike-Lattanzio-mlattanzio-rim.com.patch text/plain 12308 mlattanzio RnJvbSAwNGJhYjVlNDdlYzFkNTI3NGY5ZTk1YmI1Y2YzM2M1ODI0YjJjNGE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIExhdHRhbnppbyA8bWxhdHRhbnppb0ByaW0uY29tPgpE YXRlOiBNb24sIDEyIE1hciAyMDEyIDEwOjIxOjU0IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAx Mi0wMy0xMiAgTWlrZSBMYXR0YW56aW8gIDxtbGF0dGFuemlvQHJpbS5jb20+CgogICAgICAgIFJl bW92ZSBBY3RpdmVOb2RlQ29udGV4dCwgYW5kIHN3aXRjaCB0aGUgaW1wbGVtZW50YXRpb24gdG8K ICAgICAgICBwcm92aWRlIGEgQmxhY2tCZXJyeTo6UGxhdGZvcm06OldlYkNvbnRleHQuIFRoZSBu ZXcgb2JqZWN0CiAgICAgICAgYWRkcyBhbiBleHBsaWNpdCBJc0ltYWdlIGZsYWcsIGFzIHdlbGwg YXMgSXNBdWRpbyBhbmQgSXNWaWRlbwogICAgICAgIGZvciB0aGUgSFRNTDUgZWxlbWVudHMuCgog ICAgICAgIE5vdGUgdGhhdCBmb3IgbWFueSB2aWRlb3MgYm90aCBJc1ZpZGVvIGFuZCBJc0F1ZGlv IHdpbGwgYmUgdHJ1ZSwKICAgICAgICBhcyB2aWRlb3MgdHlwaWNhbGx5IGhhdmUgYXVkaW8gc3Ry ZWFtcyBhcyB3ZWxsLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAg ICAgKiBBcGkvQWN0aXZlTm9kZUNvbnRleHQuaDogUmVtb3ZlZC4KICAgICAgICAqIEFwaS9XZWJQ YWdlLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6d2Vi Q29udGV4dCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZTo6d2ViQ29udGV4 dCk6CiAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgogICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgot LS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQWN0aXZlTm9kZUNvbnRleHQuaCB8ICAg NzYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcCAgICAgICAgIHwgICA0OCArKysrKysrKystLS0tCiBTb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuaCAgICAgICAgICAgfCAgICA2ICstCiBTb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oICAgICAgICAgfCAgICAyICstCiBTb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICAgICAgfCAgIDIyICsrKysrKwogNSBm aWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCA5NCBkZWxldGlvbnMoLSkKIGRlbGV0ZSBt b2RlIDEwMDY0NCBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0FjdGl2ZU5vZGVDb250ZXh0 LmgKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0FjdGl2ZU5vZGVD b250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0FjdGl2ZU5vZGVDb250ZXh0 LmgKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDEyNThkMjUuLjAwMDAwMDAKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9BY3RpdmVOb2RlQ29udGV4dC5oCisrKyAvZGV2 L251bGwKQEAgLTEsNzYgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSwg MjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAq Ci0gKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2Vy IEdlbmVyYWwgUHVibGljCi0gKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKLSAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3Ig KGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KLSAqCi0gKiBUaGlzIGxpYnJhcnkg aXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKLSAqIGJ1 dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5 IG9mCi0gKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UuICBTZWUgdGhlIEdOVQotICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1v cmUgZGV0YWlscy4KLSAqCi0gKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRo ZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCi0gKiBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBs aWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCi0gKiBGb3VuZGF0aW9u LCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjEx MC0xMzAxICBVU0EKLSAqLwotCi0jaWZuZGVmIEFjdGl2ZU5vZGVDb250ZXh0X2gKLSNkZWZpbmUg QWN0aXZlTm9kZUNvbnRleHRfaAotCi0jaW5jbHVkZSAiV2ViU3RyaW5nLmgiCi0KLW5hbWVzcGFj ZSBCbGFja0JlcnJ5IHsKLW5hbWVzcGFjZSBXZWJLaXQgewotCi1jbGFzcyBBY3RpdmVOb2RlQ29u dGV4dCB7Ci1wdWJsaWM6Ci0gICAgLy8gV2UgYXNzdW1lIGEgZGVmYXVsdCBjb250ZXh0IHNob3Vs ZCBiZSBzZWxlY3RhYmxlLCBidXQgbm90aGluZyBlbHNlLgotICAgIEFjdGl2ZU5vZGVDb250ZXh0 KCkKLSAgICAgICAgOiBtX2ZsYWdzKElzU2VsZWN0YWJsZSkKLSAgICAgICAgewotICAgICAgICB9 Ci0KLSAgICBlbnVtIENvbnRleHRGbGFncyB7IElzRm9jdXNhYmxlID0gMHgwMSwKLSAgICAgICAg ICAgICAgICAgICAgICAgIElzSW5wdXQgPSAweDAyLAotICAgICAgICAgICAgICAgICAgICAgICAg SXNQYXNzd29yZCA9IDB4MDQsCi0gICAgICAgICAgICAgICAgICAgICAgICBJc1NlbGVjdGFibGUg PSAweDA4LAotICAgICAgICAgICAgICAgICAgICAgICAgSXNTaW5nbGVMaW5lID0gMHgxMCwgfTsK LQotICAgIGJvb2wgaXNGb2N1c2FibGUoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzICYgSXNGb2N1 c2FibGU7IH0KLSAgICBib29sIGlzSW5wdXQoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzICYgSXNJ bnB1dDsgfQotICAgIGJvb2wgaXNQYXNzd29yZCgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MgJiBJ c1Bhc3N3b3JkOyB9Ci0gICAgYm9vbCBpc1NlbGVjdGFibGUoKSBjb25zdCB7IHJldHVybiBtX2Zs YWdzICYgSXNTZWxlY3RhYmxlOyB9Ci0gICAgYm9vbCBpc1NpbmdsZUxpbmUoKSBjb25zdCB7IHJl dHVybiBtX2ZsYWdzICYgSXNTaW5nbGVMaW5lOyB9Ci0KLSAgICB2b2lkIHNldEZsYWcoQ29udGV4 dEZsYWdzIGZsYWcpIHsgbV9mbGFncyB8PSBmbGFnOyB9Ci0gICAgdm9pZCByZXNldEZsYWcoQ29u dGV4dEZsYWdzIGZsYWcpIHsgbV9mbGFncyAmPSB+ZmxhZzsgfQotCi0gICAgY29uc3QgV2ViU3Ry aW5nJiBpbWFnZUFsdCgpIGNvbnN0IHsgcmV0dXJuIG1faW1hZ2VBbHQ7IH0KLSAgICB2b2lkIHNl dEltYWdlQWx0KGNvbnN0IFdlYlN0cmluZyYgc3RyaW5nKSB7IG1faW1hZ2VBbHQgPSBzdHJpbmc7 IH0KLQotICAgIGNvbnN0IFdlYlN0cmluZyYgaW1hZ2VTcmMoKSBjb25zdCB7IHJldHVybiBtX2lt YWdlU3JjOyB9Ci0gICAgdm9pZCBzZXRJbWFnZVNyYyhjb25zdCBXZWJTdHJpbmcmIHN0cmluZykg eyBtX2ltYWdlU3JjID0gc3RyaW5nOyB9Ci0KLSAgICBjb25zdCBXZWJTdHJpbmcmIHBhdHRlcm4o KSBjb25zdCB7IHJldHVybiBtX3BhdHRlcm47IH0KLSAgICB2b2lkIHNldFBhdHRlcm4oY29uc3Qg V2ViU3RyaW5nJiBzdHJpbmcpIHsgbV9wYXR0ZXJuID0gc3RyaW5nOyB9Ci0KLSAgICBjb25zdCBX ZWJTdHJpbmcmIHRleHQoKSBjb25zdCB7IHJldHVybiBtX3RleHQ7IH0KLSAgICB2b2lkIHNldFRl eHQoY29uc3QgV2ViU3RyaW5nJiBzdHJpbmcpIHsgbV90ZXh0ID0gc3RyaW5nOyB9Ci0KLSAgICBj b25zdCBXZWJTdHJpbmcmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9Ci0gICAgdm9pZCBz ZXRVcmwoY29uc3QgV2ViU3RyaW5nJiBzdHJpbmcpIHsgbV91cmwgPSBzdHJpbmc7IH0KLQotcHJp dmF0ZToKLSAgICB1bnNpZ25lZCBtX2ZsYWdzOwotICAgIFdlYlN0cmluZyBtX2ltYWdlQWx0Owot ICAgIFdlYlN0cmluZyBtX2ltYWdlU3JjOwotICAgIFdlYlN0cmluZyBtX3BhdHRlcm47Ci0gICAg V2ViU3RyaW5nIG1fdGV4dDsKLSAgICBXZWJTdHJpbmcgbV91cmw7Ci19OwotCi19Ci19Ci0jZW5k aWYgLy8gQWN0aXZlTm9kZUNvbnRleHRfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZS5jcHAKaW5kZXggYWQ0MzM2MC4uM2UxMGU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC01Nyw2ICs1Nyw3IEBACiAjaW5jbHVkZSAiSFRNTEZyYW1l T3duZXJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUg IkhUTUxJbnB1dEVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgogI2luY2x1 ZGUgIkhUVFBQYXJzZXJzLmgiCkBAIC0xOTkyLDkgKzE5OTMsOSBAQCBib29sIFdlYlBhZ2VQcml2 YXRlOjp1c2VGaXhlZExheW91dCgpIGNvbnN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLUFjdGl2 ZU5vZGVDb250ZXh0IFdlYlBhZ2VQcml2YXRlOjphY3RpdmVOb2RlQ29udGV4dChUYXJnZXREZXRl Y3Rpb25TdHJhdGVneSBzdHJhdGVneSkKK1BsYXRmb3JtOjpXZWJDb250ZXh0IFdlYlBhZ2VQcml2 YXRlOjp3ZWJDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5IHN0cmF0ZWd5KQogewotICAg IEFjdGl2ZU5vZGVDb250ZXh0IGNvbnRleHQ7CisgICAgUGxhdGZvcm06OldlYkNvbnRleHQgY29u dGV4dDsKIAogICAgIFJlZlB0cjxOb2RlPiBub2RlID0gY29udGV4dE5vZGUoc3RyYXRlZ3kpOwog ICAgIG1fY3VycmVudENvbnRleHROb2RlID0gbm9kZTsKQEAgLTIwMTMsMTAgKzIwMTQsMTAgQEAg QWN0aXZlTm9kZUNvbnRleHQgV2ViUGFnZVByaXZhdGU6OmFjdGl2ZU5vZGVDb250ZXh0KFRhcmdl dERldGVjdGlvblN0cmF0ZWd5IHN0cmEKIAogICAgICAgICBTdHJpbmcgcGF0dGVybiA9IGZpbmRQ YXR0ZXJuU3RyaW5nRm9yVXJsKGhyZWYpOwogICAgICAgICBpZiAoIXBhdHRlcm4uaXNFbXB0eSgp KQotICAgICAgICAgICAgY29udGV4dC5zZXRQYXR0ZXJuKHBhdHRlcm4pOworICAgICAgICAgICAg Y29udGV4dC5zZXRQYXR0ZXJuKHBhdHRlcm4udXRmOCgpLmRhdGEoKSk7CiAKICAgICAgICAgaWYg KCFocmVmLnN0cmluZygpLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgY29udGV4dC5zZXRVcmwo aHJlZi5zdHJpbmcoKSk7CisgICAgICAgICAgICBjb250ZXh0LnNldFVybChocmVmLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgICAgICAgICAvLyBMaW5rcyBhcmUgbm9uLXNlbGVjdGFi bGUgYnkgZGVmYXVsdCwgYnV0IHNlbGVjdGlvbiBzaG91bGQgYmUgYWxsb3dlZAogICAgICAgICAg ICAgLy8gcHJvdmlkaW5nIHRoZSBwYWdlIGlzIHNlbGVjdGFibGUsIHVzZSB0aGUgcGFyZW50IHRv IGRldGVybWluZSBpdC4KQEAgLTIwMjYsNTggKzIwMjcsNzUgQEAgQWN0aXZlTm9kZUNvbnRleHQg V2ViUGFnZVByaXZhdGU6OmFjdGl2ZU5vZGVDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5 IHN0cmEKICAgICB9CiAKICAgICBpZiAoIW5vZGVBbGxvd1NlbGVjdGlvbk92ZXJyaWRlICYmICFu b2RlLT5jYW5TdGFydFNlbGVjdGlvbigpKQotICAgICAgICBjb250ZXh0LnJlc2V0RmxhZyhBY3Rp dmVOb2RlQ29udGV4dDo6SXNTZWxlY3RhYmxlKTsKKyAgICAgICAgY29udGV4dC5yZXNldEZsYWco UGxhdGZvcm06OldlYkNvbnRleHQ6OklzU2VsZWN0YWJsZSk7CiAKICAgICBpZiAobm9kZS0+aXNI VE1MRWxlbWVudCgpKSB7CiAgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQqIGltYWdlRWxlbWVudCA9 IDA7CisgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IDA7CisKICAgICAg ICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbWdUYWcpKQogICAgICAgICAgICAg aW1hZ2VFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEltYWdlRWxlbWVudCo+KG5vZGUuZ2V0KCkp OwogICAgICAgICBlbHNlIGlmIChub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6YXJlYVRhZykp CiAgICAgICAgICAgICBpbWFnZUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MQXJlYUVsZW1lbnQq Pihub2RlLmdldCgpKS0+aW1hZ2VFbGVtZW50KCk7CisKKyAgICAgICAgaWYgKHN0YXRpY19jYXN0 PEhUTUxFbGVtZW50Kj4obm9kZS5nZXQoKSktPmlzTWVkaWFFbGVtZW50KCkpCisgICAgICAgICAg ICBtZWRpYUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50Kj4obm9kZS5nZXQo KSk7CisKICAgICAgICAgaWYgKGltYWdlRWxlbWVudCAmJiBpbWFnZUVsZW1lbnQtPnJlbmRlcmVy KCkpIHsKKyAgICAgICAgICAgIGNvbnRleHQuc2V0RmxhZyhQbGF0Zm9ybTo6V2ViQ29udGV4dDo6 SXNJbWFnZSk7CiAgICAgICAgICAgICAvLyBGSVhNRTogQXQgdGhlIG1lYW4gdGltZSwgd2Ugb25s eSBzaG93ICJTYXZlIEltYWdlIiB3aGVuIHRoZSBpbWFnZSBkYXRhIGlzIGF2YWlsYWJsZS4KICAg ICAgICAgICAgIGlmIChDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSBpbWFnZUVsZW1l bnQtPmNhY2hlZEltYWdlKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoY2FjaGVkUmVzb3VyY2Ut PmlzTG9hZGVkKCkgJiYgY2FjaGVkUmVzb3VyY2UtPmRhdGEoKSkgewogICAgICAgICAgICAgICAg ICAgICBTdHJpbmcgdXJsID0gc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2VzKGltYWdl RWxlbWVudC0+Z2V0QXR0cmlidXRlKEhUTUxOYW1lczo6c3JjQXR0cikuc3RyaW5nKCkpOwotICAg ICAgICAgICAgICAgICAgICBjb250ZXh0LnNldEltYWdlU3JjKG5vZGUtPmRvY3VtZW50KCktPmNv bXBsZXRlVVJMKHVybCkuc3RyaW5nKCkpOworICAgICAgICAgICAgICAgICAgICBjb250ZXh0LnNl dFNyYyhub2RlLT5kb2N1bWVudCgpLT5jb21wbGV0ZVVSTCh1cmwpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIFN0 cmluZyBhbHQgPSBpbWFnZUVsZW1lbnQtPmFsdFRleHQoKTsKICAgICAgICAgICAgIGlmICghYWx0 LmlzTnVsbCgpKQotICAgICAgICAgICAgICAgIGNvbnRleHQuc2V0SW1hZ2VBbHQoYWx0KTsKKyAg ICAgICAgICAgICAgICBjb250ZXh0LnNldEFsdChhbHQudXRmOCgpLmRhdGEoKSk7CisgICAgICAg IH0KKworICAgICAgICBpZiAobWVkaWFFbGVtZW50KSB7CisgICAgICAgICAgICBpZiAobWVkaWFF bGVtZW50LT5oYXNBdWRpbygpKQorICAgICAgICAgICAgICAgIGNvbnRleHQuc2V0RmxhZyhQbGF0 Zm9ybTo6V2ViQ29udGV4dDo6SXNBdWRpbyk7CisgICAgICAgICAgICBpZiAobWVkaWFFbGVtZW50 LT5oYXNWaWRlbygpKQorICAgICAgICAgICAgICAgIGNvbnRleHQuc2V0RmxhZyhQbGF0Zm9ybTo6 V2ViQ29udGV4dDo6SXNWaWRlbyk7CisKKyAgICAgICAgICAgIFN0cmluZyBzcmMgPSBzdHJpcExl YWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMobWVkaWFFbGVtZW50LT5nZXRBdHRyaWJ1dGUoSFRN TE5hbWVzOjpzcmNBdHRyKS5zdHJpbmcoKSk7CisgICAgICAgICAgICBjb250ZXh0LnNldFNyYyhu b2RlLT5kb2N1bWVudCgpLT5jb21wbGV0ZVVSTChzcmMpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkp OwogICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKG5vZGUtPmlzVGV4dE5vZGUoKSkgewogICAg ICAgICBUZXh0KiBjdXJUZXh0ID0gc3RhdGljX2Nhc3Q8VGV4dCo+KG5vZGUuZ2V0KCkpOwogICAg ICAgICBpZiAoIWN1clRleHQtPndob2xlVGV4dCgpLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGNv bnRleHQuc2V0VGV4dChjdXJUZXh0LT53aG9sZVRleHQoKSk7CisgICAgICAgICAgICBjb250ZXh0 LnNldFRleHQoY3VyVGV4dC0+d2hvbGVUZXh0KCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogCiAg ICAgaWYgKG5vZGUtPmlzRWxlbWVudE5vZGUoKSkgewogICAgICAgICBFbGVtZW50KiBlbGVtZW50 ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUtPnNoYWRvd0FuY2VzdG9yTm9kZSgpKTsKICAg ICAgICAgaWYgKERPTVN1cHBvcnQ6OmlzVGV4dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVudChl bGVtZW50KSkgewotICAgICAgICAgICAgY29udGV4dC5zZXRGbGFnKEFjdGl2ZU5vZGVDb250ZXh0 OjpJc0lucHV0KTsKKyAgICAgICAgICAgIGNvbnRleHQuc2V0RmxhZyhQbGF0Zm9ybTo6V2ViQ29u dGV4dDo6SXNJbnB1dCk7CiAgICAgICAgICAgICBpZiAoZWxlbWVudC0+aGFzVGFnTmFtZShIVE1M TmFtZXM6OmlucHV0VGFnKSkKLSAgICAgICAgICAgICAgICBjb250ZXh0LnNldEZsYWcoQWN0aXZl Tm9kZUNvbnRleHQ6OklzU2luZ2xlTGluZSk7CisgICAgICAgICAgICAgICAgY29udGV4dC5zZXRG bGFnKFBsYXRmb3JtOjpXZWJDb250ZXh0OjpJc1NpbmdsZUxpbmUpOwogICAgICAgICAgICAgaWYg KERPTVN1cHBvcnQ6OmlzUGFzc3dvcmRFbGVtZW50KGVsZW1lbnQpKQotICAgICAgICAgICAgICAg IGNvbnRleHQuc2V0RmxhZyhBY3RpdmVOb2RlQ29udGV4dDo6SXNQYXNzd29yZCk7CisgICAgICAg ICAgICAgICAgY29udGV4dC5zZXRGbGFnKFBsYXRmb3JtOjpXZWJDb250ZXh0OjpJc1Bhc3N3b3Jk KTsKIAogICAgICAgICAgICAgU3RyaW5nIGVsZW1lbnRUZXh0KERPTVN1cHBvcnQ6OmlucHV0RWxl bWVudFRleHQoZWxlbWVudCkpOwogICAgICAgICAgICAgaWYgKCFlbGVtZW50VGV4dC5zdHJpcFdo aXRlU3BhY2UoKS5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgY29udGV4dC5zZXRUZXh0KGVs ZW1lbnRUZXh0KTsKKyAgICAgICAgICAgICAgICBjb250ZXh0LnNldFRleHQoZWxlbWVudFRleHQu dXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobm9kZS0+aXNGb2N1 c2FibGUoKSkKLSAgICAgICAgY29udGV4dC5zZXRGbGFnKEFjdGl2ZU5vZGVDb250ZXh0OjpJc0Zv Y3VzYWJsZSk7CisgICAgICAgIGNvbnRleHQuc2V0RmxhZyhQbGF0Zm9ybTo6V2ViQ29udGV4dDo6 SXNGb2N1c2FibGUpOwogCiAgICAgcmV0dXJuIGNvbnRleHQ7CiB9CiAKLUFjdGl2ZU5vZGVDb250 ZXh0IFdlYlBhZ2U6OmFjdGl2ZU5vZGVDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5IHN0 cmF0ZWd5KSBjb25zdAorUGxhdGZvcm06OldlYkNvbnRleHQgV2ViUGFnZTo6d2ViQ29udGV4dChU YXJnZXREZXRlY3Rpb25TdHJhdGVneSBzdHJhdGVneSkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+ YWN0aXZlTm9kZUNvbnRleHQoc3RyYXRlZ3kpOworICAgIHJldHVybiBkLT53ZWJDb250ZXh0KHN0 cmF0ZWd5KTsKIH0KIAogdm9pZCBXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQ3Vyc29yKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmgKaW5kZXggM2E4ODNjZS4uZTllZWQyMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmgKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmgKQEAgLTE5LDEwICsxOSwxMiBAQAog I2lmbmRlZiBXZWJQYWdlX2gKICNkZWZpbmUgV2ViUGFnZV9oCiAKLSNpbmNsdWRlICJBY3RpdmVO b2RlQ29udGV4dC5oIgogI2luY2x1ZGUgIkJsYWNrQmVycnlHbG9iYWwuaCIKKyNpbmNsdWRlICJX ZWJTdHJpbmcuaCIKKwogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUd1YXJkZWRQb2ludGVy Lmg+CiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtSW5wdXRFdmVudHMuaD4KKyNpbmNsdWRl IDxCbGFja0JlcnJ5UGxhdGZvcm1XZWJDb250ZXh0Lmg+CiAjaW5jbHVkZSA8aW1mL2lucHV0X2Rh dGEuaD4KICNpbmNsdWRlIDxuZXR3b3JrL05ldHdvcmtSZXF1ZXN0Lmg+CiAKQEAgLTI1Nyw3ICsy NTksNyBAQCBwdWJsaWM6CiAKICAgICBXZWJTdHJpbmcgdGV4dEhhc0F0dHJpYnV0ZShjb25zdCBX ZWJTdHJpbmcmIHF1ZXJ5KSBjb25zdDsKIAotICAgIEFjdGl2ZU5vZGVDb250ZXh0IGFjdGl2ZU5v ZGVDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5KSBjb25zdDsKKyAgICBQbGF0Zm9ybTo6 V2ViQ29udGV4dCB3ZWJDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5KSBjb25zdDsKIAog ICAgIHR5cGVkZWYgaW50cHRyX3QgQmFja0ZvcndhcmRJZDsKICAgICBzdHJ1Y3QgQmFja0Zvcndh cmRFbnRyeSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBh Z2VfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAppbmRleCBl ZDM3MzljLi4xZTNkMjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmgKQEAgLTI2Niw3ICsyNjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBub3RpZnlQbHVnaW5SZWN0 Q2hhbmdlZChpbnQgaWQsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3RDaGFuZ2VkKTsKIAog ICAgIC8vIENvbnRleHQgTWV0aG9kcy4KLSAgICBBY3RpdmVOb2RlQ29udGV4dCBhY3RpdmVOb2Rl Q29udGV4dChUYXJnZXREZXRlY3Rpb25TdHJhdGVneSk7CisgICAgUGxhdGZvcm06OldlYkNvbnRl eHQgd2ViQ29udGV4dChUYXJnZXREZXRlY3Rpb25TdHJhdGVneSk7CiAgICAgUGFzc1JlZlB0cjxX ZWJDb3JlOjpOb2RlPiBjb250ZXh0Tm9kZShUYXJnZXREZXRlY3Rpb25TdHJhdGVneSk7CiAKICNp ZiBFTkFCTEUoVklFV1BPUlRfUkVGTE9XKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5k ZXggZTJkMzJhMS4uYWE2NDg3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjUgQEAKKzIwMTItMDMtMTMgIE1pa2UgTGF0dGFuemlvICA8bWxhdHRhbnppb0ByaW0u Y29tPgorCisgICAgICAgIFJlbW92ZSBBY3RpdmVOb2RlQ29udGV4dCBpbiBmYXZvdXIgb2YgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OldlYkNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgwOTg0CisKKyAgICAgICAgUmVtb3ZlIEFjdGl2ZU5vZGVD b250ZXh0LCBhbmQgc3dpdGNoIHRoZSBpbXBsZW1lbnRhdGlvbiB0bworICAgICAgICBwcm92aWRl IGEgQmxhY2tCZXJyeTo6UGxhdGZvcm06OldlYkNvbnRleHQuIFRoZSBuZXcgb2JqZWN0CisgICAg ICAgIGFkZHMgYW4gZXhwbGljaXQgSXNJbWFnZSBmbGFnLCBhcyB3ZWxsIGFzIElzQXVkaW8gYW5k IElzVmlkZW8KKyAgICAgICAgZm9yIHRoZSBIVE1MNSBlbGVtZW50cy4KKworICAgICAgICBOb3Rl IHRoYXQgZm9yIG1hbnkgdmlkZW9zIGJvdGggSXNWaWRlbyBhbmQgSXNBdWRpbyB3aWxsIGJlIHRy dWUsCisgICAgICAgIGFzIHZpZGVvcyB0eXBpY2FsbHkgaGF2ZSBhdWRpbyBzdHJlYW1zIGFzIHdl bGwuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBB cGkvQWN0aXZlTm9kZUNvbnRleHQuaDogUmVtb3ZlZC4KKyAgICAgICAgKiBBcGkvV2ViUGFnZS5j cHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjp3ZWJDb250 ZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZTo6d2ViQ29udGV4dCk6 CisgICAgICAgICogQXBpL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBBcGkvV2ViUGFnZV9wLmg6CisK IDIwMTItMDMtMTIgIEFuZHkgQ2hlbiAgPGFuZGNoZW5AcmltLmNvbT4KIAogICAgICAgICBbQmxh Y2tiZXJyeV0gTWFrZSB0aGUgcHJvY2VzcyBvZiBtYXJraW5nIGFsbCBtYXRjaGVzIGludGVycnVw dGlibGUgYW5kIGFzeW5jaHJvbm91cyBmb3IgZmluZC1pbi1wYWdlCi0tIAoxLjcuNS40Cgo=