136443 2014-09-01 18:22:14 -0700 Build break on the EFL port since r173163 2014-09-01 19:05:22 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi cmarcelo commit-queue lucas.de.marchi luiz noam sergio zeno oldest_to_newest 1032557 0 ryuan.choi 2014-09-01 18:22:14 -0700 SSIA 1032558 1 237473 ryuan.choi 2014-09-01 18:23:57 -0700 Created attachment 237473 Patch 1032559 2 237473 commit-queue 2014-09-01 19:05:15 -0700 Comment on attachment 237473 Patch Clearing flags on attachment: 237473 Committed r173166: <http://trac.webkit.org/changeset/173166> 1032560 3 commit-queue 2014-09-01 19:05:22 -0700 All reviewed patches have been landed. Closing bug. 237473 2014-09-01 18:23:57 -0700 2014-09-01 19:05:15 -0700 Patch bug-136443-20140902102350.patch text/plain 18921 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDQ1YTQ0ODQ1MDRjYjI2 YzIxZTdhZDJmOTE0M2UzZjE3ZTVmZjMzMi4uM2Q2ODg1ZDgyY2Q5Zjc1NDg0ZTRjMGIzZGZiNDEz NmRjZTFmMGViMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA5LTAxICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBnbWFpbC5jb20+CisKKyAgICAgICAgQnVpbGQgYnJlYWsgb24g dGhlIEVGTCBwb3J0IHNpbmNlIHIxNzMxNjMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjQ0MworCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4 LgorCisgICAgICAgICogVUlQcm9jZXNzL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OkJhY2tpbmdTdG9yZTo6QmFja2luZ1N0b3JlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQmFj a2luZ1N0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29v cmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5OjpDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkpOgorICAgICAg ICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk6OnVwZGF0ZVZpZXdwb3J0KToK KyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5Ojpjb250ZW50c1Jl Y3QpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk6OnVwZGF0 ZSk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBk YXRlQmFja2luZ1N0b3JlU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdp bmdBcmVhUHJveHk6OmluY29ycG9yYXRlVXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6Q29vcmRp bmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpOgorICAg ICAgICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk6OndhaXRGb3JBbmREaXNw YXRjaERpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6Q29vcmRp bmF0ZWREcmF3aW5nQXJlYVByb3h5OjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToK KyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpleGl0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZERyYXdp bmdBcmVhUHJveHk6OnVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJv eHkuaDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpwYWdl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExh eWVyVHJlZUhvc3RQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkTGF5ZXJU cmVlSG9zdFByb3h5OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eSk6CisgICAgICAgIChX ZWJLaXQ6OkNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5Ojp+Q29vcmRpbmF0ZWRMYXllclRy ZWVIb3N0UHJveHkpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3RQ cm94eTo6Y29tbWl0Q29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlKToKKyAgICAgICAgKFdlYktpdDo6 Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHk6OnNldFZpc2libGVDb250ZW50c1JlY3QpOgor ICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eTo6cmVuZGVyTmV4 dEZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHk6 OnB1cmdlQmFja2luZ1N0b3Jlcyk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkTGF5ZXJU cmVlSG9zdFByb3h5Ojpjb21taXRTY3JvbGxPZmZzZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9D b29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvY2Fpcm8vQmFj a2luZ1N0b3JlQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViS2l0OjpCYWNraW5nU3RvcmU6OmluY29y cG9yYXRlVXBkYXRlKToKKwogMjAxNC0wOS0wMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdHdvIHVudXNlZCBXZWJLaXQyIFBERi1yZWxh dGVkIHByZWZlcmVuY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQmFj a2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9CYWNraW5nU3RvcmUuY3Bw CmluZGV4IGFhZTI5ODU4YzQ3NTViOTc2OTJjNmEwNDFkZDZkNTU1YmQ3MzEwNDguLmY5MGQ5MWNm ZmE2MGQ2MzUxZDkxMDg0OWE1NDZjNDYzZTEwYmNlNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9CYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9CYWNraW5nU3RvcmUuY3BwCkBAIC0zMyw3ICszMyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotQmFja2luZ1N0b3JlOjpCYWNraW5nU3Rv cmUoY29uc3QgSW50U2l6ZSYgc2l6ZSwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIFdlYlBhZ2VQ cm94eSogd2ViUGFnZVByb3h5KQorQmFja2luZ1N0b3JlOjpCYWNraW5nU3RvcmUoY29uc3QgSW50 U2l6ZSYgc2l6ZSwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIFdlYlBhZ2VQcm94eSYgd2ViUGFn ZVByb3h5KQogICAgIDogbV9zaXplKHNpemUpCiAgICAgLCBtX2RldmljZVNjYWxlRmFjdG9yKGRl dmljZVNjYWxlRmFjdG9yKQogICAgICwgbV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0JhY2tpbmdTdG9yZS5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0JhY2tpbmdTdG9yZS5oCmluZGV4IDk3ODYwNTA1YTJlMDczZTZl MzIzZDVlMjQ0ZDBlMzExNzcwYzhkZGMuLjZlZmZhMjllZjdkNDM2YWZkYzBmYzZkYWU0MTkwZjFm OWQ4N2RmMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9CYWNraW5nU3Rv cmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQmFja2luZ1N0b3JlLmgKQEAgLTQ1 LDcgKzQ1LDcgQEAgY2xhc3MgQmFja2luZ1N0b3JlIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJM RShCYWNraW5nU3RvcmUpOwogCiBwdWJsaWM6Ci0gICAgQmFja2luZ1N0b3JlKGNvbnN0IFdlYkNv cmU6OkludFNpemUmLCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgV2ViUGFnZVByb3h5Kik7Cisg ICAgQmFja2luZ1N0b3JlKGNvbnN0IFdlYkNvcmU6OkludFNpemUmLCBmbG9hdCBkZXZpY2VTY2Fs ZUZhY3RvciwgV2ViUGFnZVByb3h5Jik7CiAgICAgfkJhY2tpbmdTdG9yZSgpOwogCiAgICAgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQpAQCAt NjQsNyArNjQsNyBAQCBwcml2YXRlOgogCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX3NpemU7CiAg ICAgZmxvYXQgbV9kZXZpY2VTY2FsZUZhY3RvcjsKLSAgICBXZWJQYWdlUHJveHkqIG1fd2ViUGFn ZVByb3h5OworICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQYWdlUHJveHk7CiAKICNpZiBVU0UoQ0FJ Uk8pCiAgICAgT3duUHRyPFdlYkNvcmU6OldpZGdldEJhY2tpbmdTdG9yZT4gbV9iYWNraW5nU3Rv cmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFw aGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5LmNw cAppbmRleCBhOGZiMzI4YjlmZjJhODA5ZTJmOTgyZDI2YWI0N2M0MGNiYzdjMTg2Li5jNDg4MDZm MGYxMTZhNzAzZGVmYWIyYTZkNmVjYTAwOGM0N2VlN2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVh UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBo aWNzL0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1Db29yZGluYXRl ZERyYXdpbmdBcmVhUHJveHk6OkNvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJv eHkqIHdlYlBhZ2VQcm94eSkKK0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6Q29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQogICAgIDogRHJh d2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYVR5cGVDb29yZGluYXRlZCwgd2ViUGFnZVByb3h5KQog ICAgICwgbV9jdXJyZW50QmFja2luZ1N0b3JlU3RhdGVJRCgwKQogICAgICwgbV9uZXh0QmFja2lu Z1N0b3JlU3RhdGVJRCgwKQpAQCAtNTQsNyArNTQsNyBAQCBDb29yZGluYXRlZERyYXdpbmdBcmVh UHJveHk6OkNvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkqIHdlYlBhZ2VQ cgogICAgICwgbV9kaXNjYXJkQmFja2luZ1N0b3JlVGltZXIoUnVuTG9vcDo6Y3VycmVudCgpLCB0 aGlzLCAmQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpkaXNjYXJkQmFja2luZ1N0b3JlKQog ewogICAgIC8vIENvbnN0cnVjdCB0aGUgcHJveHkgZWFybHkgdG8gYWxsb3cgbWVzc2FnZXMgdG8g YmUgc2VudCB0byB0aGUgd2ViIHByb2Nlc3Mgd2hpbGUgQUMgaXMgZW50ZXJlZCB0aGVyZS4KLSAg ICBpZiAod2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNlcygpLmZvcmNlQ29tcG9z aXRpbmdNb2RlKCkpCisgICAgaWYgKHdlYlBhZ2VQcm94eS5wYWdlR3JvdXAoKS5wcmVmZXJlbmNl cygpLmZvcmNlQ29tcG9zaXRpbmdNb2RlKCkpCiAgICAgICAgIG1fY29vcmRpbmF0ZWRMYXllclRy ZWVIb3N0UHJveHkgPSBhZG9wdFB0cihuZXcgQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHko dGhpcykpOwogfQogCkBAIC0xMTAsMTIgKzExMCwxMiBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2lu Z0FyZWFQcm94eTo6cGFpbnQoQmFja2luZ1N0b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCBj bwogCiB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6dXBkYXRlVmlld3BvcnQoKQog ewotICAgIG1fd2ViUGFnZVByb3h5LT5zZXRWaWV3TmVlZHNEaXNwbGF5KHZpZXdwb3J0VmlzaWJs ZVJlY3QoKSk7CisgICAgbV93ZWJQYWdlUHJveHkuc2V0Vmlld05lZWRzRGlzcGxheSh2aWV3cG9y dFZpc2libGVSZWN0KCkpOwogfQogCiBXZWJDb3JlOjpJbnRSZWN0IENvb3JkaW5hdGVkRHJhd2lu Z0FyZWFQcm94eTo6Y29udGVudHNSZWN0KCkgY29uc3QKIHsKLSAgICByZXR1cm4gSW50UmVjdChJ bnRQb2ludDo6emVybygpLCBtX3dlYlBhZ2VQcm94eS0+dmlld1NpemUoKSk7CisgICAgcmV0dXJu IEludFJlY3QoSW50UG9pbnQ6Onplcm8oKSwgbV93ZWJQYWdlUHJveHkudmlld1NpemUoKSk7CiB9 CiAKIHZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzaXplRGlkQ2hhbmdlKCkKQEAg LTE2Miw3ICsxNjIsNyBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6dXBkYXRl KHVpbnQ2NF90IGJhY2tpbmdTdG9yZVN0YXRlSUQsIGNvbnN0IFVwZAogICAgIC8vIEZJWE1FOiBI YW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhlIHZpZXcgaXMgaGlkZGVuLgogCiAgICAgaW5jb3Jwb3Jh dGVVcGRhdGUodXBkYXRlSW5mbyk7Ci0gICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS5zZW5k KE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6RGlkVXBkYXRlKCksIG1fd2ViUGFnZVByb3h5LT5wYWdl SUQoKSk7CisgICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdp bmdBcmVhOjpEaWRVcGRhdGUoKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCiB2b2lk IENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUo dWludDY0X3QgYmFja2luZ1N0b3JlU3RhdGVJRCwgY29uc3QgVXBkYXRlSW5mbyYgdXBkYXRlSW5m bywgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29udGV4dCkKQEAgLTE3NCw3ICsx NzQsNyBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUodWludDY0X3QgYmFja2luZ1N0bwogICAgIG1faXNXYWl0aW5nRm9yRGlkVXBk YXRlQmFja2luZ1N0b3JlU3RhdGUgPSBmYWxzZTsKIAogICAgIC8vIFN0b3AgdGhlIHJlc3BvbnNp dmVuZXNzIHRpbWVyIHRoYXQgd2FzIHN0YXJ0ZWQgaW4gc2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0 YXRlLgotICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1lcigp LT5zdG9wKCk7CisgICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS0+c3RvcCgpOwogCiAgICAgaWYgKGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRyZWVD b250ZXh0KSB7CiAgICAgICAgIGlmICghbV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewpA QCAtMjQ4LDE3ICsyNDgsMTcgQEAgdm9pZCBDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk6Omlu Y29ycG9yYXRlVXBkYXRlKGNvbnN0IFVwZGF0ZUluZm8mIHVwZGF0ZUluZm8KICAgICBib29sIHNo b3VsZFNjcm9sbCA9ICF1cGRhdGVJbmZvLnNjcm9sbFJlY3QuaXNFbXB0eSgpOwogCiAgICAgaWYg KHNob3VsZFNjcm9sbCkKLSAgICAgICAgbV93ZWJQYWdlUHJveHktPnNjcm9sbFZpZXcodXBkYXRl SW5mby5zY3JvbGxSZWN0LCB1cGRhdGVJbmZvLnNjcm9sbE9mZnNldCk7CisgICAgICAgIG1fd2Vi UGFnZVByb3h5LnNjcm9sbFZpZXcodXBkYXRlSW5mby5zY3JvbGxSZWN0LCB1cGRhdGVJbmZvLnNj cm9sbE9mZnNldCk7CiAKLSAgICBpZiAoc2hvdWxkU2Nyb2xsICYmICFtX3dlYlBhZ2VQcm94eS0+ Y2FuU2Nyb2xsVmlldygpKQotICAgICAgICBtX3dlYlBhZ2VQcm94eS0+c2V0Vmlld05lZWRzRGlz cGxheShJbnRSZWN0KEludFBvaW50KCksIG1fd2ViUGFnZVByb3h5LT52aWV3U2l6ZSgpKSk7Cisg ICAgaWYgKHNob3VsZFNjcm9sbCAmJiAhbV93ZWJQYWdlUHJveHkuY2FuU2Nyb2xsVmlldygpKQor ICAgICAgICBtX3dlYlBhZ2VQcm94eS5zZXRWaWV3TmVlZHNEaXNwbGF5KEludFJlY3QoSW50UG9p bnQoKSwgbV93ZWJQYWdlUHJveHkudmlld1NpemUoKSkpOwogICAgIGVsc2UgewogICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHVwZGF0ZUluZm8udXBkYXRlUmVjdHMuc2l6ZSgpOyArK2kp Ci0gICAgICAgICAgICBtX3dlYlBhZ2VQcm94eS0+c2V0Vmlld05lZWRzRGlzcGxheSh1cGRhdGVJ bmZvLnVwZGF0ZVJlY3RzW2ldKTsKKyAgICAgICAgICAgIG1fd2ViUGFnZVByb3h5LnNldFZpZXdO ZWVkc0Rpc3BsYXkodXBkYXRlSW5mby51cGRhdGVSZWN0c1tpXSk7CiAgICAgfQogCiAgICAgaWYg KHNob3VsZFNjcm9sbCkKLSAgICAgICAgbV93ZWJQYWdlUHJveHktPmRpc3BsYXlWaWV3KCk7Cisg ICAgICAgIG1fd2ViUGFnZVByb3h5LmRpc3BsYXlWaWV3KCk7CiB9CiAKIHZvaWQgQ29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5OjpiYWNraW5nU3RvcmVTdGF0ZURpZENoYW5nZShSZXNwb25kSW1t ZWRpYXRlbHlPck5vdCByZXNwb25kSW1tZWRpYXRlbHlPck5vdCkKQEAgLTI3MSwyNCArMjcxLDI0 IEBAIHZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlQmFja2luZ1N0 b3JlU3RhdGUoUmVzcG9uZEltbWVkaWF0ZWx5CiB7CiAgICAgQVNTRVJUKG1fY3VycmVudEJhY2tp bmdTdG9yZVN0YXRlSUQgPCBtX25leHRCYWNraW5nU3RvcmVTdGF0ZUlEKTsKIAotICAgIGlmICgh bV93ZWJQYWdlUHJveHktPmlzVmFsaWQoKSkKKyAgICBpZiAoIW1fd2ViUGFnZVByb3h5LmlzVmFs aWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1faXNXYWl0aW5nRm9yRGlkVXBkYXRl QmFja2luZ1N0b3JlU3RhdGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3dlYlBhZ2VQ cm94eS0+dmlld1NpemUoKS5pc0VtcHR5KCkgJiYgIW1fd2ViUGFnZVByb3h5LT51c2VGaXhlZExh eW91dCgpKQorICAgIGlmIChtX3dlYlBhZ2VQcm94eS52aWV3U2l6ZSgpLmlzRW1wdHkoKSAmJiAh bV93ZWJQYWdlUHJveHkudXNlRml4ZWRMYXlvdXQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSA9IHJlc3BvbmRJbW1lZGlh dGVseU9yTm90ID09IFJlc3BvbmRJbW1lZGlhdGVseTsKIAotICAgIG1fd2ViUGFnZVByb3h5LT5w cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlVwZGF0ZUJhY2tpbmdTdG9yZVN0 YXRlKG1fbmV4dEJhY2tpbmdTdG9yZVN0YXRlSUQsIHJlc3BvbmRJbW1lZGlhdGVseU9yTm90ID09 IFJlc3BvbmRJbW1lZGlhdGVseSwgbV93ZWJQYWdlUHJveHktPmRldmljZVNjYWxlRmFjdG9yKCks IG1fc2l6ZSwgbV9zY3JvbGxPZmZzZXQpLCBtX3dlYlBhZ2VQcm94eS0+cGFnZUlEKCkpOworICAg IG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBk YXRlQmFja2luZ1N0b3JlU3RhdGUobV9uZXh0QmFja2luZ1N0b3JlU3RhdGVJRCwgcmVzcG9uZElt bWVkaWF0ZWx5T3JOb3QgPT0gUmVzcG9uZEltbWVkaWF0ZWx5LCBtX3dlYlBhZ2VQcm94eS5kZXZp Y2VTY2FsZUZhY3RvcigpLCBtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0KSwgbV93ZWJQYWdlUHJveHku cGFnZUlEKCkpOwogICAgIG1fc2Nyb2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCiAgICAgaWYgKG1f aXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUpIHsKICAgICAgICAgLy8gU3Rh cnQgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyLiBXZSB3aWxsIHN0b3AgaXQgd2hlbiB3ZSBoZWFy IGJhY2sgZnJvbSB0aGUgV2ViUHJvY2VzcwogICAgICAgICAvLyBpbiBkaWRVcGRhdGVCYWNraW5n U3RvcmVTdGF0ZS4KLSAgICAgICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS5yZXNwb25zaXZl bmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5y ZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiAgICAgfQogCiAgICAgaWYgKG1faXNXYWl0 aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgJiYgIW1fbGF5ZXJUcmVlQ29udGV4dC5p c0VtcHR5KCkpIHsKQEAgLTMwMiw5ICszMDIsOSBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0Fy ZWFQcm94eTo6d2FpdEZvckFuZERpc3BhdGNoRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoKQog ewogICAgIEFTU0VSVChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlKTsK IAotICAgIGlmICghbV93ZWJQYWdlUHJveHktPmlzVmFsaWQoKSkKKyAgICBpZiAoIW1fd2ViUGFn ZVByb3h5LmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX3dlYlBhZ2VQcm94 eS0+cHJvY2VzcygpLnN0YXRlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6TGF1bmNoaW5n KQorICAgIGlmIChtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc3RhdGUoKSA9PSBXZWJQcm9jZXNz UHJveHk6OlN0YXRlOjpMYXVuY2hpbmcpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZJWE1F OiB3YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseSB3aWxsIGFsd2F5cyByZXR1cm4gdGhlIG9s ZGVzdCBEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSBtZXNzYWdlIHRoYXQKQEAgLTMxMyw3ICsz MTMsNyBAQCB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6d2FpdEZvckFuZERpc3Bh dGNoRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoKQogICAgIC8vIGNob29zZSB0aGUgbW9zdCBy ZWNlbnQgb25lLCBvciB0aGUgb25lIHRoYXQgaXMgY2xvc2VzdCB0byBvdXIgY3VycmVudCBzaXpl LgogCiAgICAgLy8gVGhlIHRpbWVvdXQsIGluIHNlY29uZHMsIHdlIHVzZSB3aGVuIHdhaXRpbmcg Zm9yIGEgRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgbWVzc2FnZSB3aGVuIHdlJ3JlIGFza2Vk IHRvIHBhaW50LgotICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCkuY29ubmVjdGlvbigpLT53 YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6 RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGU+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSwgc3Rk OjpjaHJvbm86Om1pbGxpc2Vjb25kcyg1MDApKTsKKyAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNz KCkuY29ubmVjdGlvbigpLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6 RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGU+KG1fd2ViUGFnZVBy b3h5LnBhZ2VJRCgpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzKDUwMCkpOwogfQogCiB2b2lk IENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRyZWVDb250ZXh0KQpAQCAtMzIyLDcg KzMyMiw3IEBAIHZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjplbnRlckFjY2VsZXJh dGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlCiAKICAgICBtX2JhY2tpbmdTdG9yZSA9 IG51bGxwdHI7CiAgICAgbV9sYXllclRyZWVDb250ZXh0ID0gbGF5ZXJUcmVlQ29udGV4dDsKLSAg ICBtX3dlYlBhZ2VQcm94eS0+ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShsYXllclRy ZWVDb250ZXh0KTsKKyAgICBtX3dlYlBhZ2VQcm94eS5lbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRp bmdNb2RlKGxheWVyVHJlZUNvbnRleHQpOwogICAgIGlmICghbV9jb29yZGluYXRlZExheWVyVHJl ZUhvc3RQcm94eSkKICAgICAgICAgbV9jb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eSA9IGFk b3B0UHRyKG5ldyBDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eSh0aGlzKSk7CiB9CkBAIC0z MzgsNyArMzM4LDcgQEAgdm9pZCBDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk6OmV4aXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpCiAgICAgQVNTRVJUKGlzSW5BY2NlbGVyYXRlZENvbXBv c2l0aW5nTW9kZSgpKTsKIAogICAgIG1fbGF5ZXJUcmVlQ29udGV4dCA9IExheWVyVHJlZUNvbnRl eHQoKTsKLSAgICBtX3dlYlBhZ2VQcm94eS0+ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2Rl KCk7CisgICAgbV93ZWJQYWdlUHJveHkuZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7 CiB9CiAKIHZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5Ojp1cGRhdGVBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRyZWVDb250ZXh0 KQpAQCAtMzQ2LDcgKzM0Niw3IEBAIHZvaWQgQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5Ojp1 cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyCiAgICAgQVNTRVJU KGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKIAogICAgIG1fbGF5ZXJUcmVlQ29u dGV4dCA9IGxheWVyVHJlZUNvbnRleHQ7Ci0gICAgbV93ZWJQYWdlUHJveHktPnVwZGF0ZUFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGxheWVyVHJlZUNvbnRleHQpOworICAgIG1fd2ViUGFnZVBy b3h5LnVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGxheWVyVHJlZUNvbnRleHQpOwog fQogCiB2b2lkIENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eTo6ZGlzY2FyZEJhY2tpbmdTdG9y ZVNvb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJveHku aAppbmRleCA4OGFhOGU0ODE5ZTI2YTkxMjczNzJiNmY3YjY4ZjEyZjY2ZTM5ZjdlLi42MTk5MzUx ODMwZGNhNWE1ZjBjZmExODc2OTY4M2M0ZTY5NWQ4ZjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVh UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkuaApAQCAtNDUsNyArNDUsNyBAQCBjbGFzcyBD b29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eTsKIAogY2xhc3MgQ29vcmRpbmF0ZWREcmF3aW5n QXJlYVByb3h5IDogcHVibGljIERyYXdpbmdBcmVhUHJveHkgewogcHVibGljOgotICAgIGV4cGxp Y2l0IENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eShXZWJQYWdlUHJveHkqKTsKKyAgICBleHBs aWNpdCBDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5Jik7CiAgICAgdmly dHVhbCB+Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5KCk7CiAKICAgICB2b2lkIHBhaW50KEJh Y2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQsIGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmLCBXZWJDb3JlOjpSZWdpb24mIHVucGFpbnRlZFJlZ2lvbik7CkBAIC02Myw3ICs2Myw3IEBA IHB1YmxpYzoKICAgICBXZWJDb3JlOjpJbnRSZWN0IGNvbnRlbnRzUmVjdCgpIGNvbnN0OwogICAg IHZvaWQgdXBkYXRlVmlld3BvcnQoKTsKIAotICAgIFdlYlBhZ2VQcm94eSogcGFnZSgpIHsgcmV0 dXJuIG1fd2ViUGFnZVByb3h5OyB9CisgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgeyByZXR1cm4g bV93ZWJQYWdlUHJveHk7IH0KIHByaXZhdGU6CiAgICAgLy8gRHJhd2luZ0FyZWFQcm94eQogICAg IHZpcnR1YWwgdm9pZCBzaXplRGlkQ2hhbmdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3RQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9D b29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eS5jcHAKaW5kZXggZmQ0OWQ1NWExMzU2N2Q3MmMx ZTM5MDM2YThiMGQyYzliZTNjNjc5OC4uZDc2Njc5Mjg5NGNjOWY0Y2I5N2IwZmUwMDk4NmRjMDNh YTlkMzA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVl SG9zdFByb3h5LmNwcApAQCAtMzgsMTIgKzM4LDEyIEBAIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9z dFByb3h5OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eShDb29yZGluYXRlZERyYXdpbmdB CiAgICAgOiBtX2RyYXdpbmdBcmVhUHJveHkoZHJhd2luZ0FyZWFQcm94eSkKICAgICAsIG1fc2Nl bmUoYWRvcHRSZWYobmV3IENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSh0aGlzKSkpCiB7Ci0gICAg bV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCktPnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OkNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wYWdlSUQoKSwgKnRoaXMpOworICAg IG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OkNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLnBhZ2VJRCgpLCAqdGhpcyk7CiB9CiAK IENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5Ojp+Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0 UHJveHkoKQogewotICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wcm9jZXNzKCkucmVt b3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94 eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS0+cGFn ZUlEKCkpOworICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLnByb2Nlc3MoKS5yZW1vdmVN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLnBhZ2VJRCgp KTsKICAgICBtX3NjZW5lLT5kZXRhY2goKTsKIH0KIApAQCAtNjYsNyArNjYsNyBAQCB2b2lkIENv b3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5Ojpjb21taXRDb29yZGluYXRlZEdyYXBoaWNzU3Rh dGUoY29uc3QgQ29vcmRpbgogCiAgICAgdXBkYXRlVmlld3BvcnQoKTsKICNpZiBVU0UoVElMRURf QkFDS0lOR19TVE9SRSkKLSAgICBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS0+ZGlkUmVuZGVy RnJhbWUoZ3JhcGhpY3NTdGF0ZS5jb250ZW50c1NpemUsIGdyYXBoaWNzU3RhdGUuY292ZXJlZFJl Y3QpOworICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLmRpZFJlbmRlckZyYW1lKGdyYXBo aWNzU3RhdGUuY29udGVudHNTaXplLCBncmFwaGljc1N0YXRlLmNvdmVyZWRSZWN0KTsKICNlbmRp ZgogfQogCkBAIC04MiwxOSArODIsMTkgQEAgdm9pZCBDb29yZGluYXRlZExheWVyVHJlZUhvc3RQ cm94eTo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QKICAgICBp ZiAocmVjdCA9PSBtX2xhc3RTZW50VmlzaWJsZVJlY3QgJiYgdHJhamVjdG9yeVZlY3RvciA9PSBt X2xhc3RTZW50VHJhamVjdG9yeVZlY3RvcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9kcmF3 aW5nQXJlYVByb3h5LT5wYWdlKCktPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpDb29yZGluYXRl ZExheWVyVHJlZUhvc3Q6OlNldFZpc2libGVDb250ZW50c1JlY3QocmVjdCwgdHJhamVjdG9yeVZl Y3RvciksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wYWdlSUQoKSk7CisgICAgbV9kcmF3 aW5nQXJlYVByb3h5LT5wYWdlKCkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkNvb3JkaW5hdGVk TGF5ZXJUcmVlSG9zdDo6U2V0VmlzaWJsZUNvbnRlbnRzUmVjdChyZWN0LCB0cmFqZWN0b3J5VmVj dG9yKSwgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCkucGFnZUlEKCkpOwogICAgIG1fbGFzdFNl bnRWaXNpYmxlUmVjdCA9IHJlY3Q7CiAgICAgbV9sYXN0U2VudFRyYWplY3RvcnlWZWN0b3IgPSB0 cmFqZWN0b3J5VmVjdG9yOwogfQogCiB2b2lkIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFByb3h5 OjpyZW5kZXJOZXh0RnJhbWUoKQogewotICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5w cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjpSZW5kZXJO ZXh0RnJhbWUoKSwgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCktPnBhZ2VJRCgpKTsKKyAgICBt X2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6Q29vcmRp bmF0ZWRMYXllclRyZWVIb3N0OjpSZW5kZXJOZXh0RnJhbWUoKSwgbV9kcmF3aW5nQXJlYVByb3h5 LT5wYWdlKCkucGFnZUlEKCkpOwogfQogCiB2b2lkIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdFBy b3h5OjpwdXJnZUJhY2tpbmdTdG9yZXMoKQogewotICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFn ZSgpLT5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjpQ dXJnZUJhY2tpbmdTdG9yZXMoKSwgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCktPnBhZ2VJRCgp KTsKKyAgICBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS5wcm9jZXNzKCkuc2VuZChNZXNzYWdl czo6Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjpQdXJnZUJhY2tpbmdTdG9yZXMoKSwgbV9kcmF3 aW5nQXJlYVByb3h5LT5wYWdlKCkucGFnZUlEKCkpOwogfQogCiB2b2lkIENvb3JkaW5hdGVkTGF5 ZXJUcmVlSG9zdFByb3h5OjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQpA QCAtMTA3LDcgKzEwNyw3IEBAIHZvaWQgQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0UHJveHk6OnNl dEJhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiAKIHZvaWQgQ29vcmRpbmF0ZWRM YXllclRyZWVIb3N0UHJveHk6OmNvbW1pdFNjcm9sbE9mZnNldCh1aW50MzJfdCBsYXllcklELCBj b25zdCBJbnRTaXplJiBvZmZzZXQpCiB7Ci0gICAgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCkt PnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OkNvbW1p dFNjcm9sbE9mZnNldChsYXllcklELCBvZmZzZXQpLCBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2Uo KS0+cGFnZUlEKCkpOworICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLnByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OkNvbW1pdFNjcm9sbE9mZnNl dChsYXllcklELCBvZmZzZXQpLCBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS5wYWdlSUQoKSk7 CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRl ZEdyYXBoaWNzL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5h dGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKaW5kZXggMTFjZjY1MjRjNzI5OGJiOWY4NmQzMDdkMzZh YTliZmMxM2I3YTNhYi4uMDQ1OWZiYzUxMWNkMDE2ZmJmZDJlZDA4NTI0YzEzZTY5ZmY0ODU0YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvV2ViVmlldy5jcHAKQEAgLTI4Niw3ICsyODYsNyBAQCBXZWJDb3JlOjpGbG9hdFNpemUg V2ViVmlldzo6dmlzaWJsZUNvbnRlbnRzU2l6ZSgpIGNvbnN0CiAKIHN0ZDo6dW5pcXVlX3B0cjxE cmF3aW5nQXJlYVByb3h5PiBXZWJWaWV3OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKIHsKLSAg ICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHk+KHBh Z2UoKSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8Q29vcmRpbmF0ZWREcmF3aW5nQXJl YVByb3h5PigqbV9wYWdlKTsKIH0KIAogdm9pZCBXZWJWaWV3OjpzZXRWaWV3TmVlZHNEaXNwbGF5 KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGFyZWEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvY2Fpcm8vQmFja2luZ1N0b3JlQ2Fpcm8uY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNwcAppbmRleCA4OTk2OGFlNTk5YzFl ZjNiZTZlMWVkNzNlMWU3OTU5OTczMGNlNTliLi4yYTJjMmExMTJkZDUwZTNiOGRjMjNlODY5NjE5 NDk2ZmUxMjlkZjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Fpcm8v QmFja2luZ1N0b3JlQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jYWly by9CYWNraW5nU3RvcmVDYWlyby5jcHAKQEAgLTczLDkgKzczLDkgQEAgdm9pZCBCYWNraW5nU3Rv cmU6OmluY29ycG9yYXRlVXBkYXRlKFNoYXJlYWJsZUJpdG1hcCogYml0bWFwLCBjb25zdCBVcGRh dGVJbmZvJgogewogICAgIGlmICghbV9iYWNraW5nU3RvcmUpCiAjaWYgUExBVEZPUk0oRUZMKQot ICAgICAgICBtX2JhY2tpbmdTdG9yZSA9IFdpZGdldEJhY2tpbmdTdG9yZUNhaXJvOjpjcmVhdGUo RXdrVmlldzo6dG9FdmFzT2JqZWN0KHRvQVBJKG1fd2ViUGFnZVByb3h5KSksIHNpemUoKSwgZGV2 aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgIG1fYmFja2luZ1N0b3JlID0gV2lkZ2V0QmFja2lu Z1N0b3JlQ2Fpcm86OmNyZWF0ZShFd2tWaWV3Ojp0b0V2YXNPYmplY3QodG9BUEkoJm1fd2ViUGFn ZVByb3h5KSksIHNpemUoKSwgZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAjZWxzZQotICAgICAgICBt X2JhY2tpbmdTdG9yZSA9IGNyZWF0ZUJhY2tpbmdTdG9yZUZvckdUSyhtX3dlYlBhZ2VQcm94eS0+ dmlld1dpZGdldCgpLCBzaXplKCksIGRldmljZVNjYWxlRmFjdG9yKCkpOworICAgICAgICBtX2Jh Y2tpbmdTdG9yZSA9IGNyZWF0ZUJhY2tpbmdTdG9yZUZvckdUSyhtX3dlYlBhZ2VQcm94eS52aWV3 V2lkZ2V0KCksIHNpemUoKSwgZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAjZW5kaWYKIAogICAgIHNj cm9sbCh1cGRhdGVJbmZvLnNjcm9sbFJlY3QsIHVwZGF0ZUluZm8uc2Nyb2xsT2Zmc2V0KTsK