179546 2017-11-10 14:02:28 -0800 Remove the 'CompositingChildrenOnly' flag which was always on 2017-11-15 09:37:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue graouts simon.fraser webkit-bug-importer oldest_to_newest 1370489 0 simon.fraser 2017-11-10 14:02:28 -0800 Remove the 'CompositingChildrenOnly' flag which was always on 1370492 1 326628 simon.fraser 2017-11-10 14:03:45 -0800 Created attachment 326628 Patch 1370567 2 326628 commit-queue 2017-11-10 16:15:19 -0800 Comment on attachment 326628 Patch Clearing flags on attachment: 326628 Committed r224712: <https://trac.webkit.org/changeset/224712> 1370568 3 commit-queue 2017-11-10 16:15:20 -0800 All reviewed patches have been landed. Closing bug. 1371912 4 webkit-bug-importer 2017-11-15 09:37:15 -0800 <rdar://problem/35562080> 326628 2017-11-10 14:03:45 -0800 2017-11-10 16:15:19 -0800 Patch bug-179546-20171110140344.patch text/plain 9598 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2E2MTRlOWQyMjAzZmRl ZTc0YTQ5MDM5OGM4MGZmYzM3NDkwYjYzMS4uM2Y5ZWU1YmZiMGViZjhhNmJhZGVlOTI4MmNkYWQy YTYyN2YwMjA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTExLTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB0aGUg J0NvbXBvc2l0aW5nQ2hpbGRyZW5Pbmx5JyBmbGFnIHdoaWNoIHdhcyBhbHdheXMgb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTU0NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCBjYWxscyB0byB1 cGRhdGVBZnRlckxheW91dCgpIHBhc3NlZCB0aGUgQ29tcG9zaXRpbmdDaGlsZHJlbk9ubHkgZmxh Zywgc28gYWxsIGNhbGxzCisgICAgICAgIHRvIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdl b21ldHJ5KCkgaGFkIGNvbXBvc2l0ZWRDaGlsZHJlbk9ubHk9dHJ1ZSwgc28gcmVtb3ZlCisgICAg ICAgIHRoZXNlIGZsYWdzLgorCisgICAgICAgIEFsc28gdXNlIGFuIE9wdGlvblNldDw+LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUFmdGVyTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6Y29udGVudENoYW5nZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRp bmdEZXNjZW5kYW50R2VvbWV0cnkpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaDoKKwogMjAxNy0xMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBVSVdlYlZpZXcgaXMgbm90IHJlbmRlcmluZyBjb250ZW50IHRo YXQgY29tZXMgb24gc2NyZWVuIGR1cmluZyBvdmVyZmxvdyBzY3JvbGwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDUwMWZjYThmMDBjYzgwMGExZGM4NTRkMWEy MjZmYzM4MjNlMGQzNzMuLmQyOThjYTZiZDYxZjE4N2FhYzBmM2I4MTMwYmY1ZmNjZmZjNDRlZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNTc0LDExICs1 NzQsMTEgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoUmVuZGVyR2Vv bWV0cnlNYXAqIGdlb21ldHJ5TWFwLCBVcGRhdGVMYXkKICAgICAgICAgY2hpbGQtPnVwZGF0ZUxh eWVyUG9zaXRpb25zKGdlb21ldHJ5TWFwLCBmbGFncyk7CiAKICAgICBpZiAoKGZsYWdzICYgVXBk YXRlQ29tcG9zaXRpbmdMYXllcnMpICYmIGlzQ29tcG9zaXRlZCgpKSB7Ci0gICAgICAgIFJlbmRl ckxheWVyQmFja2luZzo6VXBkYXRlQWZ0ZXJMYXlvdXRGbGFncyB1cGRhdGVGbGFncyA9IFJlbmRl ckxheWVyQmFja2luZzo6Q29tcG9zaXRpbmdDaGlsZHJlbk9ubHk7CisgICAgICAgIE9wdGlvblNl dDxSZW5kZXJMYXllckJhY2tpbmc6OlVwZGF0ZUFmdGVyTGF5b3V0RmxhZ3M+IHVwZGF0ZUZsYWdz OwogICAgICAgICBpZiAoZmxhZ3MgJiBOZWVkc0Z1bGxSZXBhaW50SW5CYWNraW5nKQotICAgICAg ICAgICAgdXBkYXRlRmxhZ3MgfD0gUmVuZGVyTGF5ZXJCYWNraW5nOjpOZWVkc0Z1bGxSZXBhaW50 OworICAgICAgICAgICAgdXBkYXRlRmxhZ3MgfD0gUmVuZGVyTGF5ZXJCYWNraW5nOjpVcGRhdGVB ZnRlckxheW91dEZsYWdzOjpOZWVkc0Z1bGxSZXBhaW50OwogICAgICAgICBpZiAoaXNVcGRhdGVS b290KQotICAgICAgICAgICAgdXBkYXRlRmxhZ3MgfD0gUmVuZGVyTGF5ZXJCYWNraW5nOjpJc1Vw ZGF0ZVJvb3Q7CisgICAgICAgICAgICB1cGRhdGVGbGFncyB8PSBSZW5kZXJMYXllckJhY2tpbmc6 OlVwZGF0ZUFmdGVyTGF5b3V0RmxhZ3M6OklzVXBkYXRlUm9vdDsKICAgICAgICAgYmFja2luZygp LT51cGRhdGVBZnRlckxheW91dCh1cGRhdGVGbGFncyk7CiAgICAgfQogICAgICAgICAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggZmQ2 MGU0NGU3ZmQxNTVhYmNjYjM3YWRiMTMzYmU3MTcxNjI4ZmIyZS4uODM0ZTA3MmNkNmVmZTVkMmVm ODdiOTY5ZTQyN2VjM2RmNTA1MzM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTYyOSw3ICs2MjksNyBAQCB2b2lkIFJlbmRlckxh eWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJXaWRnZXRSZXNpemUoKQogICAgIH0KIH0KIAotdm9pZCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyTGF5b3V0KFVwZGF0ZUFmdGVyTGF5b3V0Rmxh Z3MgZmxhZ3MpCit2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJMYXlvdXQoT3B0 aW9uU2V0PFVwZGF0ZUFmdGVyTGF5b3V0RmxhZ3M+IGZsYWdzKQogewogICAgIExPRyhDb21wb3Np dGluZywgIlJlbmRlckxheWVyQmFja2luZyAlcCB1cGRhdGVBZnRlckxheW91dCAobGF5ZXIgJXAp IiwgdGhpcywgJm1fb3duaW5nTGF5ZXIpOwogCkBAIC02NDIsMTggKzY0MiwxOCBAQCB2b2lkIFJl bmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJMYXlvdXQoVXBkYXRlQWZ0ZXJMYXlvdXRGbGFn cyBmbGFncykKICAgICAgICAgLy8gVGhlIHNvbHV0aW9uIGlzIHRvIHVwZGF0ZSBjb21wb3NpdGlu ZyBjaGlsZHJlbiBvZiB0aGlzIGxheWVyIGhlcmUsCiAgICAgICAgIC8vIHZpYSB1cGRhdGVDb21w b3NpdGluZ0NoaWxkcmVuR2VvbWV0cnkoKS4KICAgICAgICAgdXBkYXRlQ29tcG9zaXRlZEJvdW5k cygpOwotICAgICAgICBjb21wb3NpdG9yKCkudXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2Vv bWV0cnkobV9vd25pbmdMYXllciwgbV9vd25pbmdMYXllciwgZmxhZ3MgJiBDb21wb3NpdGluZ0No aWxkcmVuT25seSk7CisgICAgICAgIGNvbXBvc2l0b3IoKS51cGRhdGVDb21wb3NpdGluZ0Rlc2Nl bmRhbnRHZW9tZXRyeShtX293bmluZ0xheWVyLCBtX293bmluZ0xheWVyKTsKICAgICAgICAgCi0g ICAgICAgIGlmIChmbGFncyAmIElzVXBkYXRlUm9vdCkgeworICAgICAgICBpZiAoZmxhZ3MuY29u dGFpbnMoVXBkYXRlQWZ0ZXJMYXlvdXRGbGFnczo6SXNVcGRhdGVSb290KSkgewogICAgICAgICAg ICAgdXBkYXRlR2VvbWV0cnkoKTsKICAgICAgICAgICAgIGNvbXBvc2l0b3IoKS51cGRhdGVSb290 TGF5ZXJQb3NpdGlvbigpOwogICAgICAgICAgICAgYXV0byogc3RhY2tpbmdDb250YWluZXIgPSBt X293bmluZ0xheWVyLmVuY2xvc2luZ1N0YWNraW5nQ29udGFpbmVyKCk7CiAgICAgICAgICAgICBp ZiAoIWNvbXBvc2l0b3IoKS5jb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKCkgJiYgc3RhY2tp bmdDb250YWluZXIgJiYgKHN0YWNraW5nQ29udGFpbmVyICE9ICZtX293bmluZ0xheWVyKSkKLSAg ICAgICAgICAgICAgICBjb21wb3NpdG9yKCkudXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2Vv bWV0cnkoKnN0YWNraW5nQ29udGFpbmVyLCAqc3RhY2tpbmdDb250YWluZXIsIGZsYWdzICYgQ29t cG9zaXRpbmdDaGlsZHJlbk9ubHkpOworICAgICAgICAgICAgICAgIGNvbXBvc2l0b3IoKS51cGRh dGVDb21wb3NpdGluZ0Rlc2NlbmRhbnRHZW9tZXRyeSgqc3RhY2tpbmdDb250YWluZXIsICpzdGFj a2luZ0NvbnRhaW5lcik7CiAgICAgICAgIH0KICAgICB9CiAgICAgCi0gICAgaWYgKGZsYWdzICYg TmVlZHNGdWxsUmVwYWludCAmJiBjYW5Jc3N1ZVNldE5lZWRzRGlzcGxheSgpKQorICAgIGlmIChm bGFncy5jb250YWlucyhVcGRhdGVBZnRlckxheW91dEZsYWdzOjpOZWVkc0Z1bGxSZXBhaW50KSAm JiBjYW5Jc3N1ZVNldE5lZWRzRGlzcGxheSgpKQogICAgICAgICBzZXRDb250ZW50c05lZWREaXNw bGF5KCk7CiB9CiAKQEAgLTIyMTIsNyArMjIxMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5n Ojpjb250ZW50Q2hhbmdlZChDb250ZW50Q2hhbmdlVHlwZSBjaGFuZ2VUeXBlKQogICAgIGlmICgo Y2hhbmdlVHlwZSA9PSBNYXNrSW1hZ2VDaGFuZ2VkKSAmJiBtX21hc2tMYXllcikgewogICAgICAg ICAvLyBUaGUgY29tcG9zaXRlZCBsYXllciBib3VuZHMgcmVsaWVzIG9uIGJveC0+bWFza0NsaXBS ZWN0KCksIHdoaWNoIGNoYW5nZXMKICAgICAgICAgLy8gd2hlbiB0aGUgbWFzayBpbWFnZSBiZWNv bWVzIGF2YWlsYWJsZS4KLSAgICAgICAgdXBkYXRlQWZ0ZXJMYXlvdXQoQ29tcG9zaXRpbmdDaGls ZHJlbk9ubHkgfCBJc1VwZGF0ZVJvb3QpOworICAgICAgICB1cGRhdGVBZnRlckxheW91dChVcGRh dGVBZnRlckxheW91dEZsYWdzOjpJc1VwZGF0ZVJvb3QpOwogICAgIH0KIAogI2lmIEVOQUJMRShX RUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCBjOGNjZWRiYjE5YmQwNzQxYTY2 NjQ3Yzc3OTAxYzU3Mzc0MDYwNTdiLi4zNDQ3Y2E2Zjc4NzM1MmI1N2I5NGU4MjVlMTU3ZjI2OWEz NzJlYmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCkBAIC02NSwxMyArNjUsMTEgQEAgcHVibGljOgogCiAgICAgUmVuZGVyTGF5ZXImIG93bmlu Z0xheWVyKCkgY29uc3QgeyByZXR1cm4gbV9vd25pbmdMYXllcjsgfQogCi0gICAgZW51bSBVcGRh dGVBZnRlckxheW91dEZsYWcgewotICAgICAgICBDb21wb3NpdGluZ0NoaWxkcmVuT25seSA9IDEg PDwgMCwKLSAgICAgICAgTmVlZHNGdWxsUmVwYWludCA9IDEgPDwgMSwKLSAgICAgICAgSXNVcGRh dGVSb290ID0gMSA8PCAyCisgICAgZW51bSBjbGFzcyBVcGRhdGVBZnRlckxheW91dEZsYWdzIHsK KyAgICAgICAgTmVlZHNGdWxsUmVwYWludCAgICA9IDEgPDwgMCwKKyAgICAgICAgSXNVcGRhdGVS b290ICAgICAgICA9IDEgPDwgMQogICAgIH07Ci0gICAgdHlwZWRlZiB1bnNpZ25lZCBVcGRhdGVB ZnRlckxheW91dEZsYWdzOwotICAgIHZvaWQgdXBkYXRlQWZ0ZXJMYXlvdXQoVXBkYXRlQWZ0ZXJM YXlvdXRGbGFncyk7CisgICAgdm9pZCB1cGRhdGVBZnRlckxheW91dChPcHRpb25TZXQ8VXBkYXRl QWZ0ZXJMYXlvdXRGbGFncz4pOwogICAgIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiBsYXllciBj b25maWd1cmF0aW9uIGNoYW5nZWQuCiAgICAgYm9vbCB1cGRhdGVDb25maWd1cmF0aW9uKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CmluZGV4IDE4YmQ0MTA4YjZmYmFiM2RiMjVhZTc4Nzk5MTk1NGQzZjk5NGY1MmYuLjkyODk0YTBm NTQ2ZWViOGY3YmNlNDI3YjRkMTYwZjQ1ZDA3MmVkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xODMxLDcgKzE4MzEs NyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJUcmVlR2VvbWV0cnko UmVuZGVyTGF5ZXImIGxheWVyLCBpbnQgZGVwdAogfQogCiAvLyBSZWN1cnMgZG93biB0aGUgUmVu ZGVyTGF5ZXIgdHJlZSB1bnRpbCBpdHMgZmluZHMgdGhlIGNvbXBvc2l0aW5nIGRlc2NlbmRhbnRz IG9mIGNvbXBvc2l0aW5nQW5jZXN0b3IgYW5kIHVwZGF0ZXMgdGhlaXIgZ2VvbWV0cnkuCi12b2lk IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0 cnkoUmVuZGVyTGF5ZXImIGNvbXBvc2l0aW5nQW5jZXN0b3IsIFJlbmRlckxheWVyJiBsYXllciwg Ym9vbCBjb21wb3NpdGVkQ2hpbGRyZW5Pbmx5KQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KFJlbmRlckxheWVyJiBjb21wb3Np dGluZ0FuY2VzdG9yLCBSZW5kZXJMYXllciYgbGF5ZXIpCiB7CiAgICAgaWYgKCZsYXllciAhPSAm Y29tcG9zaXRpbmdBbmNlc3RvcikgewogICAgICAgICBpZiAoYXV0byogbGF5ZXJCYWNraW5nID0g bGF5ZXIuYmFja2luZygpKSB7CkBAIC0xODQzLDE1ICsxODQzLDEzIEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0Rlc2NlbmRhbnRHZW9tZXRyeShSZW5kZXJM YXllciYgY29tCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGxheWVyQmFja2luZy0+dXBk YXRlR2VvbWV0cnkoKTsKLSAgICAgICAgICAgIGlmIChjb21wb3NpdGVkQ2hpbGRyZW5Pbmx5KSB7 Ci0gICAgICAgICAgICAgICAgbGF5ZXJCYWNraW5nLT51cGRhdGVBZnRlckRlc2NlbmRhbnRzKCk7 Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgbGF5 ZXJCYWNraW5nLT51cGRhdGVBZnRlckRlc2NlbmRhbnRzKCk7CisgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobGF5ZXIucmVmbGVjdGlvbkxheWVyKCkpCi0g ICAgICAgIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5nQW5j ZXN0b3IsICpsYXllci5yZWZsZWN0aW9uTGF5ZXIoKSwgY29tcG9zaXRlZENoaWxkcmVuT25seSk7 CisgICAgICAgIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5n QW5jZXN0b3IsICpsYXllci5yZWZsZWN0aW9uTGF5ZXIoKSk7CiAKICAgICBpZiAoIWxheWVyLmhh c0NvbXBvc2l0aW5nRGVzY2VuZGFudCgpKQogICAgICAgICByZXR1cm47CkBAIC0xODYyLDE3ICsx ODYwLDE3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0Rl c2NlbmRhbnRHZW9tZXRyeShSZW5kZXJMYXllciYgY29tCiAgICAgCiAgICAgaWYgKGF1dG8qIG5l Z1pPcmRlckxpc3QgPSBsYXllci5uZWdaT3JkZXJMaXN0KCkpIHsKICAgICAgICAgZm9yIChhdXRv KiByZW5kZXJMYXllciA6ICpuZWdaT3JkZXJMaXN0KQotICAgICAgICAgICAgdXBkYXRlQ29tcG9z aXRpbmdEZXNjZW5kYW50R2VvbWV0cnkoY29tcG9zaXRpbmdBbmNlc3RvciwgKnJlbmRlckxheWVy LCBjb21wb3NpdGVkQ2hpbGRyZW5Pbmx5KTsKKyAgICAgICAgICAgIHVwZGF0ZUNvbXBvc2l0aW5n RGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5nQW5jZXN0b3IsICpyZW5kZXJMYXllcik7CiAg ICAgfQogCiAgICAgaWYgKGF1dG8qIG5vcm1hbEZsb3dMaXN0ID0gbGF5ZXIubm9ybWFsRmxvd0xp c3QoKSkgewogICAgICAgICBmb3IgKGF1dG8qIHJlbmRlckxheWVyIDogKm5vcm1hbEZsb3dMaXN0 KQotICAgICAgICAgICAgdXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0cnkoY29tcG9z aXRpbmdBbmNlc3RvciwgKnJlbmRlckxheWVyLCBjb21wb3NpdGVkQ2hpbGRyZW5Pbmx5KTsKKyAg ICAgICAgICAgIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5n QW5jZXN0b3IsICpyZW5kZXJMYXllcik7CiAgICAgfQogICAgIAogICAgIGlmIChhdXRvKiBwb3Na T3JkZXJMaXN0ID0gbGF5ZXIucG9zWk9yZGVyTGlzdCgpKSB7CiAgICAgICAgIGZvciAoYXV0byog cmVuZGVyTGF5ZXIgOiAqcG9zWk9yZGVyTGlzdCkKLSAgICAgICAgICAgIHVwZGF0ZUNvbXBvc2l0 aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5nQW5jZXN0b3IsICpyZW5kZXJMYXllciwg Y29tcG9zaXRlZENoaWxkcmVuT25seSk7CisgICAgICAgICAgICB1cGRhdGVDb21wb3NpdGluZ0Rl c2NlbmRhbnRHZW9tZXRyeShjb21wb3NpdGluZ0FuY2VzdG9yLCAqcmVuZGVyTGF5ZXIpOwogICAg IH0KICAgICAKICAgICBpZiAoJmxheWVyICE9ICZjb21wb3NpdGluZ0FuY2VzdG9yKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXgg MDI0ZDZkMDYzYzJlNGQ1ODFjOTIwM2Y0ZTA5ZDY4MzdlN2U0NDEwMC4uYzViZDdiZWZjY2JmZGQw YTA3M2NiYzA0NGUyYmRiN2U2NGE4ZWYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtMTUxLDcgKzE1MSw3IEBAIHB1YmxpYzoK ICAgICBib29sIHVwZGF0ZUxheWVyQ29tcG9zaXRpbmdTdGF0ZShSZW5kZXJMYXllciYsIENvbXBv c2l0aW5nQ2hhbmdlUmVwYWludCA9IENvbXBvc2l0aW5nQ2hhbmdlUmVwYWludE5vdyk7CiAKICAg ICAvLyBVcGRhdGUgdGhlIGdlb21ldHJ5IGZvciBjb21wb3NpdGluZyBjaGlsZHJlbiBvZiBjb21w b3NpdGluZ0FuY2VzdG9yLgotICAgIHZvaWQgdXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2Vv bWV0cnkoUmVuZGVyTGF5ZXImIGNvbXBvc2l0aW5nQW5jZXN0b3IsIFJlbmRlckxheWVyJiwgYm9v bCBjb21wb3NpdGVkQ2hpbGRyZW5Pbmx5KTsKKyAgICB2b2lkIHVwZGF0ZUNvbXBvc2l0aW5nRGVz Y2VuZGFudEdlb21ldHJ5KFJlbmRlckxheWVyJiBjb21wb3NpdGluZ0FuY2VzdG9yLCBSZW5kZXJM YXllciYpOwogICAgIAogICAgIC8vIFdoZXRoZXIgbGF5ZXIncyBiYWNraW5nIG5lZWRzIGEgZ3Jh cGhpY3MgbGF5ZXIgdG8gZG8gY2xpcHBpbmcgYnkgYW4gYW5jZXN0b3IgKG5vbi1zdGFja2luZy1j b250ZXh0IHBhcmVudCB3aXRoIG92ZXJmbG93KS4KICAgICBib29sIGNsaXBwZWRCeUFuY2VzdG9y KFJlbmRlckxheWVyJikgY29uc3Q7Cg==