158615 2016-06-10 06:47:13 -0700 [Threaded Compositor] Modernize and simplify threaded compositor code 2016-06-14 00:51:00 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 154070 1 cgarcia webkit-unassigned bugs-noreply yoon zan oldest_to_newest 1201228 0 cgarcia 2016-06-10 06:47:13 -0700 ssia 1201230 1 281009 cgarcia 2016-06-10 06:55:33 -0700 Created attachment 281009 Patch 1201233 2 cgarcia 2016-06-10 07:02:47 -0700 Patch doesn't apply because it's done on top of patch attached to bug #154070 1202120 3 281009 zan 2016-06-14 00:37:11 -0700 Comment on attachment 281009 Patch OK. 1202125 4 cgarcia 2016-06-14 00:51:00 -0700 Committed r202038: <http://trac.webkit.org/changeset/202038> 281009 2016-06-10 06:55:33 -0700 2016-06-14 00:37:11 -0700 Patch wk2-tc-modern-code.diff text/plain 14359 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxZjNiMjc0Li5kOTc3ZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDIg QEAKIDIwMTYtMDYtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtUaHJlYWRlZCBDb21wb3NpdG9yXSBNb2Rlcm5pemUgYW5kIHNpbXBsaWZ5 IHRocmVhZGVkIGNvbXBvc2l0b3IgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NjE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNv bXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29tcG9z aXRpbmdSdW5Mb29wOjpwZXJmb3JtVGFzayk6IFVzZSBOb25jb3B5YWJsZUZ1bmN0aW9uLgorICAg ICAgICAoV2ViS2l0OjpDb21wb3NpdGluZ1J1bkxvb3A6OnBlcmZvcm1UYXNrU3luYyk6IERpdHRv LgorICAgICAgICAoV2ViS2l0OjpDb21wb3NpdGluZ1J1bkxvb3A6OnN0YXJ0VXBkYXRlVGltZXIp OiBKdXN0IHJlbmFtZWQgdG8gc3RhcnQgaW5zdGVhZCBvZiBzZXQuCisgICAgICAgIChXZWJLaXQ6 OkNvbXBvc2l0aW5nUnVuTG9vcDo6cnVuKTogRXhwb3NlIHJ1bi9zdG9wIG1ldGhvZHMgaW5zdGVh ZCBvZiB0aGUgaW50ZXJuYWwgUnVuTG9vcCBvYmplY3QuCisgICAgICAgIChXZWJLaXQ6OkNvbXBv c2l0aW5nUnVuTG9vcDo6c3RvcCk6IEFsc28gc3RvcCB0aGUgdXBkYXRlIHRpbWVyIGluc3RlYWQg b2YgcmVseWluZyBvbiB0aGUgY2FsbGVyIHRvIGRvIGl0LgorICAgICAgICAoV2ViS2l0OjpDb21w b3NpdGluZ1J1bkxvb3A6OnNldFVwZGF0ZVRpbWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktp dDo6Q29tcG9zaXRpbmdSdW5Mb29wOjpzdG9wVXBkYXRlVGltZXIpOiBEZWxldGVkLgorICAgICAg ICAqIFNoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9Db21wb3Np dGluZ1J1bkxvb3AuaDoKKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJl YWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 VGhyZWFkZWRDb21wb3NpdG9yOjpzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcp OiBQcm90ZWN0cyB0aGlzIGRpcmVjdGx5IGluIGxhbWJkYSBjYXB0dXJlLgorICAgICAgICAoV2Vi S2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OnNldERldmljZVNjYWxlRmFjdG9yKTogRGl0dG8uCisg ICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXpl KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdl Vmlld3BvcnRBdHRyaWJ1dGUpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21w b3NpdG9yOjpkaWRDaGFuZ2VDb250ZW50c1NpemUpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6 VGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpU aHJlYWRlZENvbXBvc2l0b3I6OnNjcm9sbEJ5KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlRo cmVhZGVkQ29tcG9zaXRvcjo6dXBkYXRlVmlld3BvcnQpOiBVc2Ugc3RhcnRVcGRhdGVUaW1lcigp LgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OnNjaGVkdWxlRGlzcGxheUlt bWVkaWF0ZWx5KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6 ZGlkQ2hhbmdlVmlzaWJsZVJlY3QpOiBJbXByb3ZlIGxhbWJkYSBjYXB0dXJlcy4KKyAgICAgICAg KFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpyZW5kZXJMYXllclRyZWUpOiBVc2UgbV92aWV3 cG9ydENvbnRyb2xsZXIgZGlyZWN0bHkuCisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9z aXRvcjo6Y3JlYXRlQ29tcG9zaXRpbmdUaHJlYWQpOiBVc2UgY3JlYXRlVGhyZWFkKCkgdmVyc2lv biB0aGF0IHJlY2VpdmVzIGEgZnVuY3Rpb24uCisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29t cG9zaXRvcjo6cnVuQ29tcG9zaXRpbmdUaHJlYWQpOiBVc2UgcnVuIG1ldGhvZCBhbmQgZG9uJ3Qg c3RvcCB0aGUgdXBkYXRlIHRpbWVyIHdoZW4gdGhlIHJ1bgorICAgICAgICBsb29wIGZpbmlzaGVz LgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OnRlcm1pbmF0ZUNvbXBvc2l0 aW5nVGhyZWFkKTogVXNlIHN0b3AgbWV0aG9kLgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENv bXBvc2l0b3I6OlRocmVhZGVkQ29tcG9zaXRvcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6 OlRocmVhZGVkQ29tcG9zaXRvcjo6Y29tcG9zaXRpbmdUaHJlYWRFbnRyeSk6IERlbGV0ZWQuCisg ICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1Ro cmVhZGVkQ29tcG9zaXRvci5oOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6 OnZpZXdwb3J0Q29udHJvbGxlcik6IERlbGV0ZWQuCisKKzIwMTYtMDYtMTAgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtUaHJlYWRlZCBDb21w b3NpdG9yXSBGbGlja2VyaW5nIGFuZCByZW5kZXJpbmcgYXJ0aWZhY3RzIHdoZW4gcmVzaXppbmcg dGhlIHdlYiB2aWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTQwNzAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5h dGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL0NvbXBvc2l0aW5nUnVuTG9vcC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0 b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcAppbmRleCBmNGFjZTEwLi41ZGY1ZjMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNv bXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5M b29wLmNwcApAQCAtNDAsMTMgKzQwLDEzIEBAIENvbXBvc2l0aW5nUnVuTG9vcDo6Q29tcG9zaXRp bmdSdW5Mb29wKHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4mJiB1cGRhdGVGdW5jdGlvbikKIHsKIH0K IAotdm9pZCBDb21wb3NpdGluZ1J1bkxvb3A6OnBlcmZvcm1UYXNrKHN0ZDo6ZnVuY3Rpb248dm9p ZCAoKT4mJiBmdW5jdGlvbikKK3ZvaWQgQ29tcG9zaXRpbmdSdW5Mb29wOjpwZXJmb3JtVGFzayhO b25jb3B5YWJsZUZ1bmN0aW9uPHZvaWQgKCk+JiYgZnVuY3Rpb24pCiB7CiAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKICAgICBtX3J1bkxvb3AuZGlzcGF0Y2goV1RGTW92ZShmdW5jdGlvbikp OwogfQogCi12b2lkIENvbXBvc2l0aW5nUnVuTG9vcDo6cGVyZm9ybVRhc2tTeW5jKHN0ZDo6ZnVu Y3Rpb248dm9pZCAoKT4mJiBmdW5jdGlvbikKK3ZvaWQgQ29tcG9zaXRpbmdSdW5Mb29wOjpwZXJm b3JtVGFza1N5bmMoTm9uY29weWFibGVGdW5jdGlvbjx2b2lkICgpPiYmIGZ1bmN0aW9uKQogewog ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9kaXNw YXRjaFN5bmNDb25kaXRpb25NdXRleCk7CkBAIC01OCw3ICs1OCw3IEBAIHZvaWQgQ29tcG9zaXRp bmdSdW5Mb29wOjpwZXJmb3JtVGFza1N5bmMoc3RkOjpmdW5jdGlvbjx2b2lkICgpPiYmIGZ1bmN0 aW9uKQogICAgIG1fZGlzcGF0Y2hTeW5jQ29uZGl0aW9uLndhaXQobV9kaXNwYXRjaFN5bmNDb25k aXRpb25NdXRleCk7CiB9CiAKLXZvaWQgQ29tcG9zaXRpbmdSdW5Mb29wOjpzZXRVcGRhdGVUaW1l cihVcGRhdGVUaW1pbmcgdGltaW5nKQordm9pZCBDb21wb3NpdGluZ1J1bkxvb3A6OnN0YXJ0VXBk YXRlVGltZXIoVXBkYXRlVGltaW5nIHRpbWluZykKIHsKICAgICBpZiAobV91cGRhdGVUaW1lci5p c0FjdGl2ZSgpKQogICAgICAgICByZXR1cm47CkBAIC03MSwxOCArNzEsMjMgQEAgdm9pZCBDb21w b3NpdGluZ1J1bkxvb3A6OnNldFVwZGF0ZVRpbWVyKFVwZGF0ZVRpbWluZyB0aW1pbmcpCiAgICAg bV91cGRhdGVUaW1lci5zdGFydE9uZVNob3QobmV4dFVwZGF0ZVRpbWUpOwogfQogCi12b2lkIENv bXBvc2l0aW5nUnVuTG9vcDo6c3RvcFVwZGF0ZVRpbWVyKCkKLXsKLSAgICBpZiAobV91cGRhdGVU aW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBtX3VwZGF0ZVRpbWVyLnN0b3AoKTsKLX0KLQogdm9p ZCBDb21wb3NpdGluZ1J1bkxvb3A6OnVwZGF0ZVRpbWVyRmlyZWQoKQogewogICAgIG1fdXBkYXRl RnVuY3Rpb24oKTsKICAgICBtX2xhc3RVcGRhdGVUaW1lID0gbW9ub3RvbmljYWxseUluY3JlYXNp bmdUaW1lKCk7CiB9CiAKK3ZvaWQgQ29tcG9zaXRpbmdSdW5Mb29wOjpydW4oKQoreworICAgIG1f cnVuTG9vcC5ydW4oKTsKK30KKwordm9pZCBDb21wb3NpdGluZ1J1bkxvb3A6OnN0b3AoKQorewor ICAgIG1fdXBkYXRlVGltZXIuc3RvcCgpOworICAgIG1fcnVuTG9vcC5zdG9wKCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gVVNFKENPT1JESU5BVEVEX0dSQVBISUNT X1RIUkVBREVEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVk R3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL0NvbXBvc2l0aW5nUnVuTG9vcC5oIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL0Nv bXBvc2l0aW5nUnVuTG9vcC5oCmluZGV4IGZjMGY5NWMuLjYxZmUyZTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRv ci9Db21wb3NpdGluZ1J1bkxvb3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvQ29tcG9zaXRpbmdSdW5Mb29wLmgKQEAg LTQ2LDEzICs0NiwxMyBAQCBwdWJsaWM6CiAKICAgICBDb21wb3NpdGluZ1J1bkxvb3Aoc3RkOjpm dW5jdGlvbjx2b2lkICgpPiYmKTsKIAotICAgIHZvaWQgcGVyZm9ybVRhc2soc3RkOjpmdW5jdGlv bjx2b2lkICgpPiYmKTsKLSAgICB2b2lkIHBlcmZvcm1UYXNrU3luYyhzdGQ6OmZ1bmN0aW9uPHZv aWQgKCk+JiYpOworICAgIHZvaWQgcGVyZm9ybVRhc2soTm9uY29weWFibGVGdW5jdGlvbjx2b2lk ICgpPiYmKTsKKyAgICB2b2lkIHBlcmZvcm1UYXNrU3luYyhOb25jb3B5YWJsZUZ1bmN0aW9uPHZv aWQgKCk+JiYpOwogCi0gICAgdm9pZCBzZXRVcGRhdGVUaW1lcihVcGRhdGVUaW1pbmcgdGltaW5n ID0gSW1tZWRpYXRlKTsKLSAgICB2b2lkIHN0b3BVcGRhdGVUaW1lcigpOworICAgIHZvaWQgc3Rh cnRVcGRhdGVUaW1lcihVcGRhdGVUaW1pbmcgPSBJbW1lZGlhdGUpOwogCi0gICAgUnVuTG9vcCYg cnVuTG9vcCgpIHsgcmV0dXJuIG1fcnVuTG9vcDsgfQorICAgIHZvaWQgcnVuKCk7CisgICAgdm9p ZCBzdG9wKCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVUaW1lckZpcmVkKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRl ZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0 b3IuY3BwCmluZGV4IDFjNjhlNjcuLjRhZTM0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENv bXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBo aWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCkBAIC01MCw4ICs1 MCw2IEBAIFJlZjxUaHJlYWRlZENvbXBvc2l0b3I+IFRocmVhZGVkQ29tcG9zaXRvcjo6Y3JlYXRl KENsaWVudCogY2xpZW50KQogCiBUaHJlYWRlZENvbXBvc2l0b3I6OlRocmVhZGVkQ29tcG9zaXRv cihDbGllbnQqIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKLSAgICAsIG1fZGV2aWNl U2NhbGVGYWN0b3IoMSkKLSAgICAsIG1fdGhyZWFkSWRlbnRpZmllcigwKQogewogICAgIGNyZWF0 ZUNvbXBvc2l0aW5nVGhyZWFkKCk7CiB9CkBAIC02Myw1OSArNjEsNTIgQEAgVGhyZWFkZWRDb21w b3NpdG9yOjp+VGhyZWFkZWRDb21wb3NpdG9yKCkKIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6 OnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyh1aW50NjRfdCBoYW5kbGUpCiB7 Ci0gICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAgIG1f Y29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJvdGVjdG9yLCBoYW5kbGVdIHsKLSAg ICAgICAgcHJvdGVjdG9yLT5tX25hdGl2ZVN1cmZhY2VIYW5kbGUgPSBoYW5kbGU7Ci0gICAgICAg IHByb3RlY3Rvci0+bV9zY2VuZS0+c2V0QWN0aXZlKHRydWUpOworICAgIG1fY29tcG9zaXRpbmdS dW5Mb29wLT5wZXJmb3JtVGFzayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZjxUaHJlYWRlZENv bXBvc2l0b3I+KCp0aGlzKSwgaGFuZGxlXSB7CisgICAgICAgIG1fbmF0aXZlU3VyZmFjZUhhbmRs ZSA9IGhhbmRsZTsKKyAgICAgICAgbV9zY2VuZS0+c2V0QWN0aXZlKHRydWUpOwogICAgIH0pOwog fQogCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2V0RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQg c2NhbGUpCiB7Ci0gICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMp OwotICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJvdGVjdG9yLCBzY2Fs ZV0gewotICAgICAgICBwcm90ZWN0b3ItPm1fZGV2aWNlU2NhbGVGYWN0b3IgPSBzY2FsZTsKLSAg ICAgICAgcHJvdGVjdG9yLT5zY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgpOworICAgIG1fY29t cG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZjxU aHJlYWRlZENvbXBvc2l0b3I+KCp0aGlzKSwgc2NhbGVdIHsKKyAgICAgICAgbV9kZXZpY2VTY2Fs ZUZhY3RvciA9IHNjYWxlOworICAgICAgICBzY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgpOwog ICAgIH0pOwogfQogCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRT aXplKGNvbnN0IEludFNpemUmIHNpemUpCiB7Ci0gICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRv cj4gcHJvdGVjdG9yKHRoaXMpOwotICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFz a1N5bmMoW3Byb3RlY3Rvciwgc2l6ZV0gewotICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29u dHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydFNpemUoc2l6ZSk7CisgICAgbV9jb21wb3NpdGlu Z1J1bkxvb3AtPnBlcmZvcm1UYXNrU3luYyhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZjxUaHJl YWRlZENvbXBvc2l0b3I+KCp0aGlzKSwgc2l6ZV0geworICAgICAgICBtX3ZpZXdwb3J0Q29udHJv bGxlci0+ZGlkQ2hhbmdlVmlld3BvcnRTaXplKHNpemUpOwogICAgIH0pOwogfQogCiB2b2lkIFRo cmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGUoY29uc3QgVmlld3Bv cnRBdHRyaWJ1dGVzJiBhdHRyKQogewotICAgIFJlZlB0cjxUaHJlYWRlZENvbXBvc2l0b3I+IHBy b3RlY3Rvcih0aGlzKTsKLSAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+cGVyZm9ybVRhc2soW3By b3RlY3RvciwgYXR0cl0gewotICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigp LT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZShhdHRyKTsKKyAgICBtX2NvbXBvc2l0aW5nUnVu TG9vcC0+cGVyZm9ybVRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWY8VGhyZWFkZWRDb21w b3NpdG9yPigqdGhpcyksIGF0dHJdIHsKKyAgICAgICAgbV92aWV3cG9ydENvbnRyb2xsZXItPmRp ZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlKGF0dHIpOwogICAgIH0pOwogfQogCiB2b2lkIFRocmVh ZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IEludFNpemUmIHNpemUp CiB7Ci0gICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAg IG1fY29tcG9zaXRpbmdSdW5Mb29wLT5wZXJmb3JtVGFzayhbcHJvdGVjdG9yLCBzaXplXSB7Ci0g ICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250cm9sbGVyKCktPmRpZENoYW5nZUNvbnRlbnRz U2l6ZShzaXplKTsKKyAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+cGVyZm9ybVRhc2soW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBSZWY8VGhyZWFkZWRDb21wb3NpdG9yPigqdGhpcyksIHNpemVdIHsK KyAgICAgICAgbV92aWV3cG9ydENvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRzU2l6ZShzaXpl KTsKICAgICB9KTsKIH0KIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNjcm9sbFRvKGNvbnN0 IEludFBvaW50JiBwb3NpdGlvbikKIHsKLSAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBw cm90ZWN0b3IodGhpcyk7Ci0gICAgbV9jb21wb3NpdGluZ1J1bkxvb3AtPnBlcmZvcm1UYXNrKFtw cm90ZWN0b3IsIHBvc2l0aW9uXSB7Ci0gICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250cm9s bGVyKCktPnNjcm9sbFRvKHBvc2l0aW9uKTsKKyAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+cGVy Zm9ybVRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWY8VGhyZWFkZWRDb21wb3NpdG9yPigq dGhpcyksIHBvc2l0aW9uXSB7CisgICAgICAgIG1fdmlld3BvcnRDb250cm9sbGVyLT5zY3JvbGxU byhwb3NpdGlvbik7CiAgICAgfSk7CiB9CiAKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzY3Jv bGxCeShjb25zdCBJbnRTaXplJiBkZWx0YSkKIHsKLSAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3Np dG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgbV9jb21wb3NpdGluZ1J1bkxvb3AtPnBlcmZvcm1U YXNrKFtwcm90ZWN0b3IsIGRlbHRhXSB7Ci0gICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250 cm9sbGVyKCktPnNjcm9sbEJ5KGRlbHRhKTsKKyAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+cGVy Zm9ybVRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWY8VGhyZWFkZWRDb21wb3NpdG9yPigq dGhpcyksIGRlbHRhXSB7CisgICAgICAgIG1fdmlld3BvcnRDb250cm9sbGVyLT5zY3JvbGxCeShk ZWx0YSk7CiAgICAgfSk7CiB9CiAKQEAgLTEzMSw3ICsxMjIsNyBAQCB2b2lkIFRocmVhZGVkQ29t cG9zaXRvcjo6cmVuZGVyTmV4dEZyYW1lKCkKIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnVw ZGF0ZVZpZXdwb3J0KCkKIHsKLSAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+c2V0VXBkYXRlVGlt ZXIoQ29tcG9zaXRpbmdSdW5Mb29wOjpXYWl0VW50aWxOZXh0RnJhbWUpOworICAgIG1fY29tcG9z aXRpbmdSdW5Mb29wLT5zdGFydFVwZGF0ZVRpbWVyKENvbXBvc2l0aW5nUnVuTG9vcDo6V2FpdFVu dGlsTmV4dEZyYW1lKTsKIH0KIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmNvbW1pdFNjcm9s bE9mZnNldCh1aW50MzJfdCBsYXllcklELCBjb25zdCBJbnRTaXplJiBvZmZzZXQpCkBAIC0xNzMs MTggKzE2NCwxNSBAQCBHTENvbnRleHQqIFRocmVhZGVkQ29tcG9zaXRvcjo6Z2xDb250ZXh0KCkK IAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNjaGVkdWxlRGlzcGxheUltbWVkaWF0ZWx5KCkK IHsKLSAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+c2V0VXBkYXRlVGltZXIoQ29tcG9zaXRpbmdS dW5Mb29wOjpJbW1lZGlhdGUpOworICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5zdGFydFVwZGF0 ZVRpbWVyKENvbXBvc2l0aW5nUnVuTG9vcDo6SW1tZWRpYXRlKTsKIH0KIAogdm9pZCBUaHJlYWRl ZENvbXBvc2l0b3I6OmRpZENoYW5nZVZpc2libGVSZWN0KCkKIHsKICAgICBBU1NFUlQoJlJ1bkxv b3A6OmN1cnJlbnQoKSA9PSAmbV9jb21wb3NpdGluZ1J1bkxvb3AtPnJ1bkxvb3AoKSk7CiAKLSAg ICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgRmxvYXRS ZWN0IHZpc2libGVSZWN0ID0gdmlld3BvcnRDb250cm9sbGVyKCktPnZpc2libGVDb250ZW50c1Jl Y3QoKTsKLSAgICBmbG9hdCBzY2FsZSA9IHZpZXdwb3J0Q29udHJvbGxlcigpLT5wYWdlU2NhbGVG YWN0b3IoKTsKLSAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RvciwgdmlzaWJs ZVJlY3QsIHNjYWxlXSB7Ci0gICAgICAgIHByb3RlY3Rvci0+bV9jbGllbnQtPnNldFZpc2libGVD b250ZW50c1JlY3QodmlzaWJsZVJlY3QsIEZsb2F0UG9pbnQ6Onplcm8oKSwgc2NhbGUpOworICAg IFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZjxUaHJl YWRlZENvbXBvc2l0b3I+KCp0aGlzKSwgdmlzaWJsZVJlY3QgPSBtX3ZpZXdwb3J0Q29udHJvbGxl ci0+dmlzaWJsZUNvbnRlbnRzUmVjdCgpLCBzY2FsZSA9IG1fdmlld3BvcnRDb250cm9sbGVyLT5w YWdlU2NhbGVGYWN0b3IoKV0geworICAgICAgICBtX2NsaWVudC0+c2V0VmlzaWJsZUNvbnRlbnRz UmVjdCh2aXNpYmxlUmVjdCwgRmxvYXRQb2ludDo6emVybygpLCBzY2FsZSk7CiAgICAgfSk7CiAK ICAgICBzY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgpOwpAQCAtMjAyLDggKzE5MCw4IEBAIHZv aWQgVGhyZWFkZWRDb21wb3NpdG9yOjpyZW5kZXJMYXllclRyZWUoKQogICAgIEZsb2F0UmVjdCBj bGlwUmVjdCgwLCAwLCBtX3ZpZXdwb3J0U2l6ZS53aWR0aCgpLCBtX3ZpZXdwb3J0U2l6ZS5oZWln aHQoKSk7CiAKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCB2aWV3cG9ydFRyYW5zZm9ybTsKLSAg ICBGbG9hdFBvaW50IHNjcm9sbFBvc3Rpb24gPSB2aWV3cG9ydENvbnRyb2xsZXIoKS0+dmlzaWJs ZUNvbnRlbnRzUmVjdCgpLmxvY2F0aW9uKCk7Ci0gICAgdmlld3BvcnRUcmFuc2Zvcm0uc2NhbGUo dmlld3BvcnRDb250cm9sbGVyKCktPnBhZ2VTY2FsZUZhY3RvcigpICogbV9kZXZpY2VTY2FsZUZh Y3Rvcik7CisgICAgRmxvYXRQb2ludCBzY3JvbGxQb3N0aW9uID0gbV92aWV3cG9ydENvbnRyb2xs ZXItPnZpc2libGVDb250ZW50c1JlY3QoKS5sb2NhdGlvbigpOworICAgIHZpZXdwb3J0VHJhbnNm b3JtLnNjYWxlKG1fdmlld3BvcnRDb250cm9sbGVyLT5wYWdlU2NhbGVGYWN0b3IoKSAqIG1fZGV2 aWNlU2NhbGVGYWN0b3IpOwogICAgIHZpZXdwb3J0VHJhbnNmb3JtLnRyYW5zbGF0ZSgtc2Nyb2xs UG9zdGlvbi54KCksIC1zY3JvbGxQb3N0aW9uLnkoKSk7CiAKICAgICBtX3NjZW5lLT5wYWludFRv Q3VycmVudEdMQ29udGV4dCh2aWV3cG9ydFRyYW5zZm9ybSwgMSwgY2xpcFJlY3QsIENvbG9yOjp3 aGl0ZSwgZmFsc2UsIHNjcm9sbFBvc3Rpb24pOwpAQCAtMjIyLDE5ICsyMTAsMTMgQEAgdm9pZCBU aHJlYWRlZENvbXBvc2l0b3I6OnVwZGF0ZVNjZW5lU3RhdGUoY29uc3QgQ29vcmRpbmF0ZWRHcmFw aGljc1N0YXRlJiBzdGF0ZSkKICAgICBzY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgpOwogfQog Ci12b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6Y29tcG9zaXRpbmdUaHJlYWRFbnRyeSh2b2lkKiBj b29yZGluYXRlZENvbXBvc2l0b3IpCi17Ci0gICAgc3RhdGljX2Nhc3Q8VGhyZWFkZWRDb21wb3Np dG9yKj4oY29vcmRpbmF0ZWRDb21wb3NpdG9yKS0+cnVuQ29tcG9zaXRpbmdUaHJlYWQoKTsKLX0K LQogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmNyZWF0ZUNvbXBvc2l0aW5nVGhyZWFkKCkKIHsK ICAgICBpZiAobV90aHJlYWRJZGVudGlmaWVyKQogICAgICAgICByZXR1cm47CiAKICAgICBMb2Nr SG9sZGVyIGxvY2tlcihtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uTXV0ZXgpOwotICAgIG1f dGhyZWFkSWRlbnRpZmllciA9IGNyZWF0ZVRocmVhZChjb21wb3NpdGluZ1RocmVhZEVudHJ5LCB0 aGlzLCAiV2ViQ29yZTogVGhyZWFkZWRDb21wb3NpdG9yIik7Ci0KKyAgICBtX3RocmVhZElkZW50 aWZpZXIgPSBjcmVhdGVUaHJlYWQoIldlYktpdDogVGhyZWFkZWRDb21wb3NpdG9yIiwgW3RoaXNd IHsgcnVuQ29tcG9zaXRpbmdUaHJlYWQoKTsgfSk7CiAgICAgbV9pbml0aWFsaXplUnVuTG9vcENv bmRpdGlvbi53YWl0KG1faW5pdGlhbGl6ZVJ1bkxvb3BDb25kaXRpb25NdXRleCk7CiB9CiAKQEAg LTI1Miw5ICsyMzQsOCBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6cnVuQ29tcG9zaXRpbmdU aHJlYWQoKQogICAgICAgICBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uLm5vdGlmeU9uZSgp OwogICAgIH0KIAotICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5ydW5Mb29wKCkucnVuKCk7Cisg ICAgbV9jb21wb3NpdGluZ1J1bkxvb3AtPnJ1bigpOwogCi0gICAgbV9jb21wb3NpdGluZ1J1bkxv b3AtPnN0b3BVcGRhdGVUaW1lcigpOwogICAgIG1fc2NlbmUtPnB1cmdlR0xSZXNvdXJjZXMoKTsK IAogICAgIHsKQEAgLTI3NCw3ICsyNTUsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6dGVy bWluYXRlQ29tcG9zaXRpbmdUaHJlYWQoKQogICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fdGVybWlu YXRlUnVuTG9vcENvbmRpdGlvbk11dGV4KTsKIAogICAgIG1fc2NlbmUtPmRldGFjaCgpOwotICAg IG1fY29tcG9zaXRpbmdSdW5Mb29wLT5ydW5Mb29wKCkuc3RvcCgpOworICAgIG1fY29tcG9zaXRp bmdSdW5Mb29wLT5zdG9wKCk7CiAKICAgICBtX3Rlcm1pbmF0ZVJ1bkxvb3BDb25kaXRpb24ud2Fp dChtX3Rlcm1pbmF0ZVJ1bkxvb3BDb25kaXRpb25NdXRleCk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3Iv VGhyZWFkZWRDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRH cmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKaW5kZXggNjQ0 MTZiOC4uMzcwMDMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5h dGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaApAQCAtOTAsNyArOTAsNiBAQCBwcml2YXRlOgogCiAg ICAgYm9vbCBlbnN1cmVHTENvbnRleHQoKTsKICAgICBXZWJDb3JlOjpHTENvbnRleHQqIGdsQ29u dGV4dCgpOwotICAgIFNpbXBsZVZpZXdwb3J0Q29udHJvbGxlciogdmlld3BvcnRDb250cm9sbGVy KCkgeyByZXR1cm4gbV92aWV3cG9ydENvbnRyb2xsZXIuZ2V0KCk7IH0KIAogICAgIHZvaWQgY3Jl YXRlQ29tcG9zaXRpbmdUaHJlYWQoKTsKICAgICB2b2lkIHJ1bkNvbXBvc2l0aW5nVGhyZWFkKCk7 CkBAIC0xMDQsMTIgKzEwMywxMiBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJD b3JlOjpHTENvbnRleHQ+IG1fY29udGV4dDsKIAogICAgIFdlYkNvcmU6OkludFNpemUgbV92aWV3 cG9ydFNpemU7Ci0gICAgZmxvYXQgbV9kZXZpY2VTY2FsZUZhY3RvcjsKLSAgICB1aW50NjRfdCBt X25hdGl2ZVN1cmZhY2VIYW5kbGU7CisgICAgZmxvYXQgbV9kZXZpY2VTY2FsZUZhY3RvciB7IDEg fTsKKyAgICB1aW50NjRfdCBtX25hdGl2ZVN1cmZhY2VIYW5kbGUgeyAwIH07CiAKICAgICBzdGQ6 OnVuaXF1ZV9wdHI8Q29tcG9zaXRpbmdSdW5Mb29wPiBtX2NvbXBvc2l0aW5nUnVuTG9vcDsKIAot ICAgIFRocmVhZElkZW50aWZpZXIgbV90aHJlYWRJZGVudGlmaWVyOworICAgIFRocmVhZElkZW50 aWZpZXIgbV90aHJlYWRJZGVudGlmaWVyIHsgMCB9OwogICAgIENvbmRpdGlvbiBtX2luaXRpYWxp emVSdW5Mb29wQ29uZGl0aW9uOwogICAgIExvY2sgbV9pbml0aWFsaXplUnVuTG9vcENvbmRpdGlv bk11dGV4OwogICAgIENvbmRpdGlvbiBtX3Rlcm1pbmF0ZVJ1bkxvb3BDb25kaXRpb247Cg==