55084 2011-02-23 14:14:39 -0800 Remove some of the old accelerated compositing code 2011-02-23 17:40:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 356411 0 andersca 2011-02-23 14:14:39 -0800 Remove some of the old accelerated compositing code 356412 1 83547 andersca 2011-02-23 14:15:22 -0800 Created attachment 83547 Patch 356592 2 andersca 2011-02-23 17:40:30 -0800 Committed r79509: <http://trac.webkit.org/changeset/79509> 83547 2011-02-23 14:15:22 -0800 2011-02-23 14:24:19 -0800 Patch bug-55084-20110223141521.patch text/plain 20008 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5NDg4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDItMjMgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc29tZSBvZiB0aGUgb2xkIGFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU1MDg0CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50 SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdNb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2VfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL0xheWVyQmFja2VkRHJh d2luZ0FyZWFQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJCYWNrZWREcmF3aW5n QXJlYVByb3h5OjphdHRhY2hDb21wb3NpdGluZ0NvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpM YXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmRldGFjaENvbXBvc2l0aW5nQ29udGV4dCk6Cisg ICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv d2luL1dlYlZpZXcuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisKIDIwMTEt MDItMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bh Z2VDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNs aWVudC5oCShyZXZpc2lvbiA3OTQ3MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdl Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTExOSw5ICsxMTksNiBAQCBwdWJsaWM6CiAjaWYg VVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIHZpcnR1YWwgdm9pZCBlbnRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKSA9IDA7CiAgICAg dmlydHVhbCB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpID0gMDsKLSAgICAK LSAgICB2aXJ0dWFsIHZvaWQgcGFnZURpZEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpID0g MDsKLSAgICB2aXJ0dWFsIHZvaWQgcGFnZURpZExlYXZlQWNjZWxlcmF0ZWRDb21wb3NpdGluZygp ID0gMDsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oV0lOKQpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc5NDcyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0ODks MTggKzI0ODksNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZnJhbWVTZXRMYXJnZXN0RnJhbWVDCiAg ICAgbV9mcmFtZVNldExhcmdlc3RGcmFtZSA9IGZyYW1lOwogfQogCi0jaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQotdm9pZCBXZWJQYWdlUHJveHk6OmRpZENoYW5nZUFjY2VsZXJhdGVk Q29tcG9zaXRpbmcoYm9vbCBjb21wb3NpdGluZywgRHJhd2luZ0FyZWFJbmZvJiBkcmF3aW5nQXJl YUluZm8pCi17Ci0gICAgaWYgKGNvbXBvc2l0aW5nKQotICAgICAgICBkaWRFbnRlckFjY2VsZXJh dGVkQ29tcG9zaXRpbmcoKTsKLSAgICBlbHNlCi0gICAgICAgIGRpZExlYXZlQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpOwotCi0gICAgZHJhd2luZ0FyZWFJbmZvID0gZHJhd2luZ0FyZWEoKS0+aW5m bygpOwotfQotI2VuZGlmCi0KIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzRGlkQmVjb21lVW5y ZXNwb25zaXZlKCkKIHsKICAgICBtX2xvYWRlckNsaWVudC5wcm9jZXNzRGlkQmVjb21lVW5yZXNw b25zaXZlKHRoaXMpOwpAQCAtMjYxMCwxNyArMjU5OCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpl eGl0QWNjZWxlcmF0ZWRDb21wb3MKIHsKICAgICBtX3BhZ2VDbGllbnQtPmV4aXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZSgpOwogfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRW50ZXJBY2Nl bGVyYXRlZENvbXBvc2l0aW5nKCkKLXsKLSAgICBtX3BhZ2VDbGllbnQtPnBhZ2VEaWRFbnRlckFj Y2VsZXJhdGVkQ29tcG9zaXRpbmcoKTsKLX0KLQotdm9pZCBXZWJQYWdlUHJveHk6OmRpZExlYXZl QWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCi17Ci0gICAgbV9wYWdlQ2xpZW50LT5wYWdlRGlkTGVh dmVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCk7Ci19Ci0KICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZENsZWFyKCkK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDc5 NDcyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNDAsMTEgKzM0MCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZXhp dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CiAjZW5kaWYKICAgICAKLSNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgdm9pZCBkaWRFbnRlckFjY2VsZXJhdGVkQ29tcG9z aXRpbmcoKTsKLSAgICB2b2lkIGRpZExlYXZlQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOwotI2Vu ZGlmCi0KICAgICB2b2lkIGRpZERyYXcoKTsKIAogICAgIGVudW0gVW5kb09yUmVkbyB7IFVuZG8s IFJlZG8gfTsKQEAgLTU4MCwxMCArNTc1LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGZvY3VzZWRG cmFtZUNoYW5nZWQodWludDY0X3QgZnJhbWVJRCk7CiAgICAgdm9pZCBmcmFtZVNldExhcmdlc3RG cmFtZUNoYW5nZWQodWludDY0X3QgZnJhbWVJRCk7CiAKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCi0gICAgdm9pZCBkaWRDaGFuZ2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nKGJvb2wg Y29tcG9zaXRpbmcsIERyYXdpbmdBcmVhSW5mbyYpOwotI2VuZGlmCi0KICAgICB2b2lkIGNhbkF1 dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VJbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQs IGNvbnN0IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZSYsIGJvb2wmIGNhbkF1dGhlbnRpY2F0ZSk7 CiAgICAgdm9pZCBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UodWludDY0X3QgZnJh bWVJRCwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmLCB1aW50NjRfdCBj aGFsbGVuZ2VJRCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gNzk0NzIpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0x NjcsMTEgKzE2Nyw2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgIyBDb250ZXh0 TWVudSBtZXNzYWdlcwogICAgIFNob3dDb250ZXh0TWVudShXZWJDb3JlOjpJbnRQb2ludCBtZW51 TG9jYXRpb24sIFdlYktpdDo6Q29udGV4dE1lbnVTdGF0ZSBzdGF0ZSwgVmVjdG9yPFdlYktpdDo6 V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gaXRlbXMsIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2Vy TWVzc2FnZUVuY29kZXIgdXNlckRhdGEpCiAKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0gICAgIyBBY2NlbGVyYXRlZCBjb21wb3NpdGluZyBtZXNzYWdlcwotICAgIERpZENoYW5n ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoYm9vbCBjb21wb3NpdGluZykgLT4gKFdlYktpdDo6RHJh d2luZ0FyZWFJbmZvIG5ld0RyYXdpbmdBcmVhKQotI2VuZGlmCi0KICAgICAjIEF1dGhlbnRpY2F0 aW9uIG1lc3NhZ2VzCiAgICAgQ2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUlu RnJhbWUodWludDY0X3QgZnJhbWVJRCwgV2ViQ29yZTo6UHJvdGVjdGlvblNwYWNlIHByb3RlY3Rp b25TcGFjZSkgLT4gKGJvb2wgY2FuQXV0aGVudGljYXRlKQogICAgIERpZFJlY2VpdmVBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZSh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSBjaGFsbGVuZ2UsIHVpbnQ2NF90IGNoYWxsZW5nZUlEKQpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCShyZXZp c2lvbiA3OTQ3MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGll bnRJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTg2LDExICs4Niw2IEBAIHByaXZhdGU6CiAgICAg dmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJU cmVlQ29udGV4dCYpOwogICAgIHZpcnR1YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUoKTsKIAotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICB2aXJ0dWFs IHZvaWQgcGFnZURpZEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpOwotICAgIHZpcnR1YWwg dm9pZCBwYWdlRGlkTGVhdmVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCk7Ci0jZW5kaWYKLQogICAg IHZpcnR1YWwgdm9pZCBhY2Nlc3NpYmlsaXR5V2ViUHJvY2Vzc1Rva2VuUmVjZWl2ZWQoY29uc3Qg Q29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpOyAgICAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29tcGxl eFRleHRJbnB1dEVuYWJsZWQodWludDY0X3QgcGx1Z2luQ29tcGxleFRleHRJbnB1dElkZW50aWZp ZXIsIGJvb2wgY29tcGxleFRleHRJbnB1dEVuYWJsZWQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRB dXRvZGlzcGxheShib29sKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiA3OTQ3MikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0zNTMsMTYgKzM1Myw2IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OmV4aXRBY2NlbGVyYXRl ZENvbXAKIHsKICAgICBbbV93a1ZpZXcgX2V4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZV07 CiB9Ci0KLXZvaWQgUGFnZUNsaWVudEltcGw6OnBhZ2VEaWRFbnRlckFjY2VsZXJhdGVkQ29tcG9z aXRpbmcoKQotewotICAgIFttX3drVmlldyBfcGFnZURpZEVudGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZ107Ci19Ci0KLXZvaWQgUGFnZUNsaWVudEltcGw6OnBhZ2VEaWRMZWF2ZUFjY2VsZXJhdGVk Q29tcG9zaXRpbmcoKQotewotICAgIFttX3drVmlldyBfcGFnZURpZExlYXZlQWNjZWxlcmF0ZWRD b21wb3NpdGluZ107Ci19CiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQog CiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRDb21wbGV4VGV4dElucHV0RW5hYmxlZCh1aW50NjRf dCBwbHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgYm9vbCBjb21wbGV4VGV4dElucHV0 RW5hYmxlZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0JKHJldmlzaW9uIDc5NDc5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv V0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xODI1LDk1ICsxODI1LDYgQEAgLSAodm9pZClf c2V0RmluZEluZGljYXRvcjooUGFzc1JlZlB0cjxGaQogICAgIF9kYXRhLT5fZmluZEluZGljYXRv cldpbmRvdy0+c2V0RmluZEluZGljYXRvcihmaW5kSW5kaWNhdG9yLCBmYWRlT3V0KTsKIH0KIAot I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLS0gKHZvaWQpX3N0YXJ0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZzooQ0FMYXllciAqKXJvb3RMYXllcgotewotICAgIGlmICghX2RhdGEtPl9v bGRMYXllckhvc3RpbmdWaWV3KSB7Ci0gICAgICAgIE5TVmlldyAqaG9zdGluZ1ZpZXcgPSBbW05T VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpbc2VsZiBib3VuZHNdXTsKLSNpZiAhZGVmaW5lZChC VUlMRElOR19PTl9MRU9QQVJEKQotICAgICAgICBbaG9zdGluZ1ZpZXcgc2V0QXV0b3Jlc2l6aW5n TWFzazooTlNWaWV3V2lkdGhTaXphYmxlIHwgTlNWaWV3SGVpZ2h0U2l6YWJsZSldOwotI2VuZGlm Ci0gICAgICAgIAotICAgICAgICBbc2VsZiBhZGRTdWJ2aWV3Omhvc3RpbmdWaWV3XTsKLSAgICAg ICAgW2hvc3RpbmdWaWV3IHJlbGVhc2VdOwotICAgICAgICBfZGF0YS0+X29sZExheWVySG9zdGlu Z1ZpZXcgPSBob3N0aW5nVmlldzsKLSAgICB9Ci0KLSAgICAvLyBNYWtlIGEgY29udGFpbmVyIGxh eWVyLCB3aGljaCB3aWxsIGdldCBzaXplZC9wb3NpdGlvbmVkIGJ5IEFwcEtpdCBhbmQgQ0EuCi0g ICAgQ0FMYXllciAqdmlld0xheWVyID0gW0NBTGF5ZXIgbGF5ZXJdOwotCi0jaWZuZGVmIE5ERUJV RwotICAgIFt2aWV3TGF5ZXIgc2V0TmFtZTpAImhvc3RpbmcgbGF5ZXIiXTsKLSNlbmRpZgotCi0j aWYgZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKQotICAgIC8vIFR1cm4gb2ZmIGRlZmF1bHQg YW5pbWF0aW9ucy4KLSAgICBOU051bGwgKm51bGxWYWx1ZSA9IFtOU051bGwgbnVsbF07Ci0gICAg TlNEaWN0aW9uYXJ5ICphY3Rpb25zID0gW05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVj dHNBbmRLZXlzOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsVmFsdWUsIEAiYW5j aG9yUG9pbnQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsVmFsdWUsIEAiYm91 bmRzIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAImNvbnRlbnRz IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAImNvbnRlbnRzUmVj dCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJvcGFjaXR5IiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAInBvc2l0aW9uIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAInN1YmxheWVyVHJhbnNmb3Jt IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAInN1YmxheWVycyIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJ0cmFuc2Zvcm0iLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWxdOwotICAgIFt2aWV3TGF5ZXIgc2V0U3R5 bGU6W05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdDphY3Rpb25zIGZvcktleTpAImFj dGlvbnMiXV07Ci0jZW5kaWYKLQotI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCi0g ICAgLy8gSWYgd2UgYXJlbid0IGluIHRoZSB3aW5kb3cgeWV0LCB3ZSdsbCB1c2UgdGhlIHNjcmVl bidzIHNjYWxlIGZhY3RvciBub3csIGFuZCByZXNldCB0aGUgc2NhbGUgCi0gICAgLy8gdmlhIC12 aWV3RGlkTW92ZVRvV2luZG93LgotICAgIENHRmxvYXQgc2NhbGVGYWN0b3IgPSBbc2VsZiB3aW5k b3ddID8gW1tzZWxmIHdpbmRvd10gdXNlclNwYWNlU2NhbGVGYWN0b3JdIDogW1tOU1NjcmVlbiBt YWluU2NyZWVuXSB1c2VyU3BhY2VTY2FsZUZhY3Rvcl07Ci0gICAgW3ZpZXdMYXllciBzZXRUcmFu c2Zvcm06Q0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IsIDEp XTsKLSNlbmRpZgotCi0gICAgW19kYXRhLT5fb2xkTGF5ZXJIb3N0aW5nVmlldyBzZXRMYXllcjp2 aWV3TGF5ZXJdOwotICAgIFtfZGF0YS0+X29sZExheWVySG9zdGluZ1ZpZXcgc2V0V2FudHNMYXll cjpZRVNdOwotICAgIAotICAgIC8vIFBhcmVudCBvdXIgcm9vdCBsYXllciBpbiB0aGUgY29udGFp bmVyIGxheWVyCi0gICAgW3ZpZXdMYXllciBhZGRTdWJsYXllcjpyb290TGF5ZXJdOwotfQotCi0t ICh2b2lkKV9zdG9wQWNjZWxlcmF0ZWRDb21wb3NpdGluZwotewotICAgIGlmIChfZGF0YS0+X29s ZExheWVySG9zdGluZ1ZpZXcpIHsKLSAgICAgICAgW19kYXRhLT5fb2xkTGF5ZXJIb3N0aW5nVmll dyBzZXRMYXllcjpuaWxdOwotICAgICAgICBbX2RhdGEtPl9vbGRMYXllckhvc3RpbmdWaWV3IHNl dFdhbnRzTGF5ZXI6Tk9dOwotICAgICAgICBbX2RhdGEtPl9vbGRMYXllckhvc3RpbmdWaWV3IHJl bW92ZUZyb21TdXBlcnZpZXddOwotICAgICAgICBfZGF0YS0+X29sZExheWVySG9zdGluZ1ZpZXcg PSBuaWw7Ci0gICAgfQotfQotCi0tICh2b2lkKV9zd2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVj ZXNzYXJ5OihEcmF3aW5nQXJlYUluZm86OlR5cGUpdHlwZQotewotICAgIERyYXdpbmdBcmVhSW5m bzo6VHlwZSBleGlzdGluZ0RyYXdpbmdBcmVhVHlwZSA9IF9kYXRhLT5fcGFnZS0+ZHJhd2luZ0Fy ZWEoKSA/IF9kYXRhLT5fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+aW5mbygpLnR5cGUgOiBEcmF3aW5n QXJlYUluZm86Ok5vbmU7Ci0gICAgaWYgKGV4aXN0aW5nRHJhd2luZ0FyZWFUeXBlID09IHR5cGUp Ci0gICAgICAgIHJldHVybjsKLQotICAgIE93blB0cjxEcmF3aW5nQXJlYVByb3h5PiBuZXdEcmF3 aW5nQXJlYTsKLSAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICAgICAgY2FzZSBEcmF3aW5nQXJlYUlu Zm86OkltcGw6Ci0gICAgICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpOb25lOgotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpDaHVua2VkVXBkYXRlOiB7 Ci0gICAgICAgICAgICBuZXdEcmF3aW5nQXJlYSA9IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVBy b3h5OjpjcmVhdGUoc2VsZiwgX2RhdGEtPl9wYWdlLmdldCgpKTsKLSAgICAgICAgICAgIGJyZWFr OwotICAgICAgICB9Ci0gICAgICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpMYXllckJhY2tlZDog ewotICAgICAgICAgICAgbmV3RHJhd2luZ0FyZWEgPSBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJv eHk6OmNyZWF0ZShzZWxmLCBfZGF0YS0+X3BhZ2UuZ2V0KCkpOwotICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBuZXdEcmF3aW5nQXJlYS0+c2V0U2l6ZShJbnRTaXpl KFtzZWxmIGZyYW1lXS5zaXplKSwgSW50U2l6ZSgpKTsKLQotICAgIF9kYXRhLT5fcGFnZS0+ZHJh d2luZ0FyZWEoKS0+ZGV0YWNoQ29tcG9zaXRpbmdDb250ZXh0KCk7Ci0gICAgX2RhdGEtPl9wYWdl LT5zZXREcmF3aW5nQXJlYShuZXdEcmF3aW5nQXJlYS5yZWxlYXNlKCkpOwotfQotCiAtICh2b2lk KV9lbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlOihjb25zdCBMYXllclRyZWVDb250ZXh0 JilsYXllclRyZWVDb250ZXh0CiB7CiAgICAgQVNTRVJUKCFfZGF0YS0+X2xheWVySG9zdGluZ1Zp ZXcpOwpAQCAtMTk1MywxOCArMTg2NCw2IEBAIC0gKHZvaWQpX2V4aXRBY2NlbGVyYXRlZENvbXBv c2l0aW5nTW9kZQogICAgIF9kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldyA9IG51bGxwdHI7CiB9CiAK LS0gKHZvaWQpX3BhZ2VEaWRFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmcKLXsKLSAgICBbc2Vs ZiBfc3dpdGNoVG9EcmF3aW5nQXJlYVR5cGVJZk5lY2Vzc2FyeTpEcmF3aW5nQXJlYUluZm86Okxh eWVyQmFja2VkXTsKLX0KLQotLSAodm9pZClfcGFnZURpZExlYXZlQWNjZWxlcmF0ZWRDb21wb3Np dGluZwotewotICAgIC8vIEZJWE1FOiB3ZSBtYXkgd2FudCB0byBhdm9pZCBmbGlwcGluZyBiYWNr IHRvIHRoZSBub24tbGF5ZXItYmFja2VkIGRyYXdpbmcgYXJlYSB1bnRpbCB0aGUgbmV4dCBwYWdl IGxvYWQsIHRvIGF2b2lkIHRocmFzaGluZy4KLSAgICBbc2VsZiBfc3dpdGNoVG9EcmF3aW5nQXJl YVR5cGVJZk5lY2Vzc2FyeTpEcmF3aW5nQXJlYUluZm86OkNodW5rZWRVcGRhdGVdOwotfQotI2Vu ZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLQogLSAodm9pZClfc2V0QWNjZXNz aWJpbGl0eVdlYlByb2Nlc3NUb2tlbjooTlNEYXRhICopZGF0YQogewogI2lmICFkZWZpbmVkKEJV SUxESU5HX09OX1NOT1dfTEVPUEFSRCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gNzk0NzIpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNv cHkpCkBAIC01MiwxMyArNTIsNiBAQCBAaW50ZXJmYWNlIFdLVmlldyAoSW50ZXJuYWwpCiAtICh2 b2lkKV9lbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlOihjb25zdCBXZWJLaXQ6OkxheWVy VHJlZUNvbnRleHQmKWxheWVyVHJlZUNvbnRleHQ7CiAtICh2b2lkKV9leGl0QWNjZWxlcmF0ZWRD b21wb3NpdGluZ01vZGU7CiAKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0tICh2 b2lkKV9zdGFydEFjY2VsZXJhdGVkQ29tcG9zaXRpbmc6KENBTGF5ZXIgKilyb290TGF5ZXI7Ci0t ICh2b2lkKV9zdG9wQWNjZWxlcmF0ZWRDb21wb3NpdGluZzsKLS0gKHZvaWQpX3BhZ2VEaWRFbnRl ckFjY2VsZXJhdGVkQ29tcG9zaXRpbmc7Ci0tICh2b2lkKV9wYWdlRGlkTGVhdmVBY2NlbGVyYXRl ZENvbXBvc2l0aW5nOwotI2VuZGlmCi0KIC0gKHZvaWQpX3NldEFjY2Vzc2liaWxpdHlXZWJQcm9j ZXNzVG9rZW46KE5TRGF0YSAqKWRhdGE7CiAtICh2b2lkKV9zZXRDb21wbGV4VGV4dElucHV0RW5h YmxlZDooQk9PTCljb21wbGV4VGV4dElucHV0RW5hYmxlZCBwbHVnaW5Db21wbGV4VGV4dElucHV0 SWRlbnRpZmllcjoodWludDY0X3QpcGx1Z2luQ29tcGxleFRleHRJbnB1dElkZW50aWZpZXI7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAkocmV2 aXNpb24gNzk0NzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2Vf cC5oCSh3b3JraW5nIGNvcHkpCkBAIC02Miw4ICs2Miw2IEBAIHB1YmxpYzoKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRD b21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOwogICAgIHZpcnR1YWwgdm9p ZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKLSAgICB2b2lkIHBhZ2VEaWRFbnRl ckFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSB7IH0KLSAgICB2b2lkIHBhZ2VEaWRMZWF2ZUFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmcoKSB7IH0KICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiAgICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNv cmU6OkludFNpemUmKTsKICAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZENyYXNoKCk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94 eU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xheWVy QmFja2VkRHJhd2luZ0FyZWFQcm94eU1hYy5tbQkocmV2aXNpb24gNzk0NzIpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eU1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNTEsNDIgKzUxLDEwIEBAIHZvaWQgTGF5ZXJCYWNrZWREcmF3aW5n QXJlYVByb3h5OjpwbGF0Zm8KIAogdm9pZCBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmF0 dGFjaENvbXBvc2l0aW5nQ29udGV4dCh1aW50MzJfdCBjb250ZXh0SUQpCiB7Ci0jaWYgSEFWRShI T1NURURfQ09SRV9BTklNQVRJT04pCi0gICAgbV9jb21wb3NpdGluZ1Jvb3RMYXllciA9IFdLTWFr ZVJlbmRlckxheWVyKGNvbnRleHRJRCk7Ci0KLSAgICAvLyBUdXJuIG9mZiBkZWZhdWx0IGFuaW1h dGlvbnMuCi0gICAgTlNOdWxsICpudWxsVmFsdWUgPSBbTlNOdWxsIG51bGxdOwotICAgIE5TRGlj dGlvbmFyeSAqYWN0aW9ucyA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3RzQW5k S2V5czoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAImFuY2hvclBv aW50IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbFZhbHVlLCBAImJvdW5kcyIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJjb250ZW50cyIsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJjb250ZW50c1JlY3QiLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsVmFsdWUsIEAib3BhY2l0eSIsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJwb3NpdGlvbiIsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJzdWJsYXllclRyYW5zZm9ybSIsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxWYWx1ZSwgQCJzdWJsYXllcnMiLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsVmFsdWUsIEAidHJhbnNmb3JtIiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbmlsXTsKLSAgICBbbV9jb21wb3NpdGluZ1Jvb3RMYXll ci5nZXQoKSBzZXRTdHlsZTpbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OmFjdGlv bnMgZm9yS2V5OkAiYWN0aW9ucyJdXTsKLSAgICAKLSAgICBbbV9jb21wb3NpdGluZ1Jvb3RMYXll ci5nZXQoKSBzZXRBbmNob3JQb2ludDpDR1BvaW50WmVyb107Ci0gICAgW21fY29tcG9zaXRpbmdS b290TGF5ZXIuZ2V0KCkgc2V0Qm91bmRzOkNHUmVjdE1ha2UoMCwgMCwgc2l6ZSgpLndpZHRoKCks IHNpemUoKS5oZWlnaHQoKSldOwotICAgIAotICAgIC8vIEZJWE1FOiB0aGlzIGZpeGVzIHRoZSBs YXllciBqaWdnbGUgd2hlbiByZXNpemluZyB0aGUgd2luZG93LCBidXQgYnJlYWtzIGxheWVyIGZs aXBwaW5nIGJlY2F1c2UKLSAgICAvLyBDQSBkb2Vzbid0IHByb3BhZ2F0ZSB0aGUga0NBTGF5ZXJG bGFnRmxpcHBlZEFib3ZlIHRocm91Z2ggdGhlIHJlbW90ZSBsYXllci4KLSAgICAvLyBbbV9jb21w b3NpdGluZ1Jvb3RMYXllci5nZXQoKSBzZXRHZW9tZXRyeUZsaXBwZWQ6WUVTXTsKLQotI2lmbmRl ZiBOREVCVUcKLSAgICBbbV9jb21wb3NpdGluZ1Jvb3RMYXllci5nZXQoKSBzZXROYW1lOkAiQ29t cG9zaXRpbmcgcm9vdCBsYXllciJdOwotI2VuZGlmCi0KLSAgICBbbV93ZWJWaWV3IF9zdGFydEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmc6bV9jb21wb3NpdGluZ1Jvb3RMYXllci5nZXQoKV07Ci0jZW5k aWYKIH0KIAogdm9pZCBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmRldGFjaENvbXBvc2l0 aW5nQ29udGV4dCgpCiB7Ci0gICAgW21fd2ViVmlldyBfc3RvcEFjY2VsZXJhdGVkQ29tcG9zaXRp bmddOwogICAgIG1fY29tcG9zaXRpbmdSb290TGF5ZXIgPSAwOwogfQogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDc5NDcyKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTE4Myw0NiArMTE4Myw2IEBAIHZvaWQgV2ViVmlldzo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRp bmcKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBXZWJWaWV3OjpwYWdlRGlk RW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkKLXsKLSAgICBBU1NFUlQoIXVzZU5ld0RyYXdp bmdBcmVhKCkpOwotICAgIHN3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZOZWNlc3NhcnkoRHJhd2lu Z0FyZWFJbmZvOjpMYXllckJhY2tlZCk7Ci19Ci0KLXZvaWQgV2ViVmlldzo6cGFnZURpZExlYXZl QWNjZWxlcmF0ZWRDb21wb3NpdGluZygpCi17Ci0gICAgQVNTRVJUKCF1c2VOZXdEcmF3aW5nQXJl YSgpKTsKLSAgICBzd2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5KERyYXdpbmdBcmVh SW5mbzo6Q2h1bmtlZFVwZGF0ZSk7Ci19Ci0KLXZvaWQgV2ViVmlldzo6c3dpdGNoVG9EcmF3aW5n QXJlYVR5cGVJZk5lY2Vzc2FyeShEcmF3aW5nQXJlYUluZm86OlR5cGUgdHlwZSkKLXsKLSAgICBB U1NFUlQoIXVzZU5ld0RyYXdpbmdBcmVhKCkpOwotCi0gICAgRHJhd2luZ0FyZWFJbmZvOjpUeXBl IGV4aXN0aW5nRHJhd2luZ0FyZWFUeXBlID0gbV9wYWdlLT5kcmF3aW5nQXJlYSgpID8gbV9wYWdl LT5kcmF3aW5nQXJlYSgpLT5pbmZvKCkudHlwZSA6IERyYXdpbmdBcmVhSW5mbzo6Tm9uZTsKLSAg ICBpZiAoZXhpc3RpbmdEcmF3aW5nQXJlYVR5cGUgPT0gdHlwZSkKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IG5ld0RyYXdpbmdBcmVhOwotICAgIHN3aXRj aCAodHlwZSkgewotICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpJbXBsOgotICAgIGNhc2UgRHJh d2luZ0FyZWFJbmZvOjpOb25lOgotICAgICAgICBicmVhazsKLSAgICBjYXNlIERyYXdpbmdBcmVh SW5mbzo6Q2h1bmtlZFVwZGF0ZToKLSAgICAgICAgbmV3RHJhd2luZ0FyZWEgPSBDaHVua2VkVXBk YXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMsIG1fcGFnZS5nZXQoKSk7Ci0gICAgICAg IGJyZWFrOwotICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpMYXllckJhY2tlZDoKLSAgICAgICAg bmV3RHJhd2luZ0FyZWEgPSBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlz LCBtX3BhZ2UuZ2V0KCkpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBpZiAobV9wYWdl LT5kcmF3aW5nQXJlYSgpKQotICAgICAgICBuZXdEcmF3aW5nQXJlYS0+c2V0U2l6ZShtX3BhZ2Ut PmRyYXdpbmdBcmVhKCktPnNpemUoKSwgSW50U2l6ZSgpKTsKLQotICAgIG1fcGFnZS0+ZHJhd2lu Z0FyZWEoKS0+ZGV0YWNoQ29tcG9zaXRpbmdDb250ZXh0KCk7Ci0gICAgbV9wYWdlLT5zZXREcmF3 aW5nQXJlYShuZXdEcmF3aW5nQXJlYS5yZWxlYXNlKCkpOwotfQotCiAjZW5kaWYgLy8gVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCiBIV05EIFdlYlZpZXc6Om5hdGl2ZVdpbmRvdygpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkocmV2aXNpb24gNzk0NzIp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkod29ya2luZyBjb3B5 KQpAQCAtMTYxLDEwICsxNjEsNiBAQCBwcml2YXRlOgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKICAgICB2aXJ0dWFsIHZvaWQgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9k ZShjb25zdCBMYXllclRyZWVDb250ZXh0Jik7CiAgICAgdmlydHVhbCB2b2lkIGV4aXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSgpOwotCi0gICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRFbnRlckFj Y2VsZXJhdGVkQ29tcG9zaXRpbmcoKTsKLSAgICB2aXJ0dWFsIHZvaWQgcGFnZURpZExlYXZlQWNj ZWxlcmF0ZWRDb21wb3NpdGluZygpOwotICAgIHZvaWQgc3dpdGNoVG9EcmF3aW5nQXJlYVR5cGVJ Zk5lY2Vzc2FyeShEcmF3aW5nQXJlYUluZm86OlR5cGUpOwogI2VuZGlmCiAKICAgICB2b2lkIGRp ZENvbW1pdExvYWRGb3JNYWluRnJhbWUoYm9vbCB1c2VDdXN0b21SZXByZXNlbnRhdGlvbik7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShy ZXZpc2lvbiA3OTQ3MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzI0LDQ1ICszMjQsMTMgQEAgdm9pZCBXZWJQYWdl OjpjbGVhck1haW5GcmFtZU5hbWUoKQogfQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQotdm9pZCBXZWJQYWdlOjpjaGFuZ2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShXZWJD b3JlOjpHcmFwaGljc0xheWVyKiBsYXllcikKLXsKLSAgICBpZiAobV9pc0Nsb3NlZCkKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgLy8gV2l0aCB0aGUgbmV3IGRyYXdpbmcgYXJlYSB3ZSBkb24ndCBu ZWVkIHRvIGluZm9ybSB0aGUgVUkgcHJvY2VzcyB3aGVuIHRoZSBhY2NlbGVyYXRlZAotICAgIC8v IGNvbXBvc2l0aW5nIG1vZGUgY2hhbmdlcy4KLSAgICBpZiAobV9kcmF3aW5nQXJlYS0+aW5mbygp LnR5cGUgPT0gRHJhd2luZ0FyZWFJbmZvOjpJbXBsKQotICAgICAgICByZXR1cm47Ci0KLSAgICBi b29sIGNvbXBvc2l0aW5nID0gbGF5ZXI7Ci0gICAgCi0gICAgLy8gVGVsbCB0aGUgVUkgcHJvY2Vz cyB0aGF0IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGNoYW5nZWQuIEl0IG1heSByZXNwb25kIGJ5 IGNoYW5naW5nCi0gICAgLy8gZHJhd2luZyBhcmVhIHR5cGVzLgotICAgIERyYXdpbmdBcmVhSW5m byBuZXdEcmF3aW5nQXJlYUluZm87Ci0KLSAgICBpZiAoIXNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZENoYW5nZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoY29tcG9zaXRpbmcpLCBN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDaGFuZ2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nOjpS ZXBseShuZXdEcmF3aW5nQXJlYUluZm8pKSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGlm IChuZXdEcmF3aW5nQXJlYUluZm8udHlwZSAhPSBkcmF3aW5nQXJlYSgpLT5pbmZvKCkudHlwZSkg ewotICAgICAgICBtX2RyYXdpbmdBcmVhID0gMDsKLSAgICAgICAgaWYgKG5ld0RyYXdpbmdBcmVh SW5mby50eXBlICE9IERyYXdpbmdBcmVhSW5mbzo6Tm9uZSkgewotICAgICAgICAgICAgV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwotICAgICAgICAgICAgcGFyYW1ldGVycy5k cmF3aW5nQXJlYUluZm8gPSBuZXdEcmF3aW5nQXJlYUluZm87Ci0gICAgICAgICAgICBtX2RyYXdp bmdBcmVhID0gRHJhd2luZ0FyZWE6OmNyZWF0ZSh0aGlzLCBwYXJhbWV0ZXJzKTsKLSAgICAgICAg ICAgIG1fZHJhd2luZ0FyZWEtPnNldE5lZWRzRGlzcGxheShJbnRSZWN0KEludFBvaW50KDAsIDAp LCBtX3ZpZXdTaXplKSk7Ci0gICAgICAgIH0KLSAgICB9Ci19Ci0KIHZvaWQgV2ViUGFnZTo6ZW50 ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShHcmFwaGljc0xheWVyKiBsYXllcikKIHsKLSAg ICBjaGFuZ2VBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShsYXllcik7CiAgICAgbV9kcmF3aW5n QXJlYS0+c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIobGF5ZXIpOwogfQogCiB2b2lkIFdlYlBhZ2U6 OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpCiB7Ci0gICAgY2hhbmdlQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoMCk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0Um9vdENvbXBvc2l0 aW5nTGF5ZXIoMCk7CiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gNzk0NzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTYsNyArMjE2 LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVyTG9hZGlu Zyk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgdm9pZCBjaGFuZ2VB Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShXZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CiAgICAg dm9pZCBlbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXIqKTsKICAgICB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwogI2VuZGlm Cg==