104109 2012-12-05 03:26:48 -0800 Remove unneeded WTF prefix from WTF types in RenderFlexibleBox 2012-12-05 09:53:05 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104112 1 cgarcia webkit-unassigned darin eric ojan tony webkit.review.bot oldest_to_newest 783593 0 cgarcia 2012-12-05 03:26:48 -0800 WTF prefix is not needed because WTF headers have a using statement at the end of the file. 783594 1 177712 cgarcia 2012-12-05 03:29:28 -0800 Created attachment 177712 Patch 783858 2 177712 eric 2012-12-05 09:47:02 -0800 Comment on attachment 177712 Patch Yup 783866 3 177712 webkit.review.bot 2012-12-05 09:53:02 -0800 Comment on attachment 177712 Patch Clearing flags on attachment: 177712 Committed r136709: <http://trac.webkit.org/changeset/136709> 783867 4 webkit.review.bot 2012-12-05 09:53:05 -0800 All reviewed patches have been landed. Closing bug. 177712 2012-12-05 03:29:28 -0800 2012-12-05 09:53:02 -0800 Patch wcore-flexbox-wtf-prefix.diff text/plain 12447 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNDFkMWMwLi41NTRlMzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTItMTItMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJlbW92ZSB1bm5lZWRlZCBXVEYgcHJlZml4IGZyb20gV1RGIHR5cGVzIGlu IFJlbmRlckZsZXhpYmxlQm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDQxMDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXVEYgcHJlZml4IGlzIG5vdCBuZWVkZWQgYmVjYXVzZSBXVEYgaGVhZGVycyBo YXZlIGEgdXNpbmcKKyAgICAgICAgc3RhdGVtZW50IGF0IHRoZSBlbmQgb2YgdGhlIGZpbGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckZsZXhpYmxlQm94OjpyZXBvc2l0aW9uTG9naWNhbEhlaWdodERlcGVuZGVudEZsZXhJ dGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0 ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9sYXRp b25zKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpyZXNvbHZlRmxleGli bGVMZW5ndGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRB bmRQbGFjZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojph bGlnbkZsZXhMaW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWxp Z25DaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxpcEZv cldyYXBSZXZlcnNlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoK KworMjAxMi0xMi0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgRmxleCBpdGVtIGF1dG8gbWFyZ2lucyBpbiB0aGUgY3Jvc3MgZGlyZWN0aW9u IHNob3VsZCBzYWZlIGNlbnRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAzOTE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guY3BwCmluZGV4IDM5YWZjZTAuLmViNGM1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzI4LDcgKzMyOCw3IEBA IHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJl biwgTGF5b3V0VW5pdCkKIAogICAgIFJlbmRlckJsb2NrOjpzdGFydERlbGF5VXBkYXRlU2Nyb2xs SW5mbygpOwogCi0gICAgV1RGOjpWZWN0b3I8TGluZUNvbnRleHQ+IGxpbmVDb250ZXh0czsKKyAg ICBWZWN0b3I8TGluZUNvbnRleHQ+IGxpbmVDb250ZXh0czsKICAgICBPcmRlckhhc2hTZXQgb3Jk ZXJWYWx1ZXM7CiAgICAgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMocmVsYXlvdXRDaGls ZHJlbiwgb3JkZXJWYWx1ZXMpOwogICAgIG1fb3JkZXJJdGVyYXRvciA9IGFkb3B0UHRyKG5ldyBP cmRlckl0ZXJhdG9yKHRoaXMsIG9yZGVyVmFsdWVzKSk7CkBAIC00MDYsNyArNDA2LDcgQEAgdm9p ZCBSZW5kZXJGbGV4aWJsZUJveDo6cGFpbnRDaGlsZHJlbihQYWludEluZm8mIHBhaW50SW5mbywg Y29uc3QgTGF5b3V0UG9pbnQmIHAKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyRmxleGlibGVCb3g6 OnJlcG9zaXRpb25Mb2dpY2FsSGVpZ2h0RGVwZW5kZW50RmxleEl0ZW1zKE9yZGVySXRlcmF0b3Im IGl0ZXJhdG9yLCBXVEY6OlZlY3RvcjxMaW5lQ29udGV4dD4mIGxpbmVDb250ZXh0cywgTGF5b3V0 VW5pdCYgb2xkQ2xpZW50QWZ0ZXJFZGdlKQordm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6cmVwb3Np dGlvbkxvZ2ljYWxIZWlnaHREZXBlbmRlbnRGbGV4SXRlbXMoT3JkZXJJdGVyYXRvciYgaXRlcmF0 b3IsIFZlY3RvcjxMaW5lQ29udGV4dD4mIGxpbmVDb250ZXh0cywgTGF5b3V0VW5pdCYgb2xkQ2xp ZW50QWZ0ZXJFZGdlKQogewogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzU3RhcnRFZGdlID0gbGlu ZUNvbnRleHRzLmlzRW1wdHkoKSA/IExheW91dFVuaXQoKSA6IGxpbmVDb250ZXh0c1swXS5jcm9z c0F4aXNPZmZzZXQ7CiAgICAgYWxpZ25GbGV4TGluZXMoaXRlcmF0b3IsIGxpbmVDb250ZXh0cyk7 CkBAIC03MjMsNyArNzIzLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlZmVy cmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KgogICAgIHJldHVybiBz dGQ6Om1heChMYXlvdXRVbml0KDApLCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGls ZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgZmxleEJhc2lzKSk7CiB9CiAKLXZvaWQgUmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgV1RGOjpW ZWN0b3I8TGluZUNvbnRleHQ+JiBsaW5lQ29udGV4dHMpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94 OjpsYXlvdXRGbGV4SXRlbXMoT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIFZlY3RvcjxMaW5lQ29u dGV4dD4mIGxpbmVDb250ZXh0cykKIHsKICAgICBPcmRlcmVkRmxleEl0ZW1MaXN0IG9yZGVyZWRD aGlsZHJlbjsKICAgICBMYXlvdXRVbml0IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwpAQCAtNzM3 LDcgKzczNyw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhPcmRl ckl0ZXJhdG9yJiBpdGVyYXRvciwgV1RGOjpWZWN0b3I8TGluCiAgICAgICAgIExheW91dFVuaXQg YXZhaWxhYmxlRnJlZVNwYWNlID0gbWFpbkF4aXNDb250ZW50RXh0ZW50KHByZWZlcnJlZE1haW5B eGlzRXh0ZW50KSAtIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwogICAgICAgICBGbGV4U2lnbiBm bGV4U2lnbiA9IChtaW5NYXhBcHBsaWVkTWFpbkF4aXNFeHRlbnQgPCBwcmVmZXJyZWRNYWluQXhp c0V4dGVudCArIGF2YWlsYWJsZUZyZWVTcGFjZSkgPyBQb3NpdGl2ZUZsZXhpYmlsaXR5IDogTmVn YXRpdmVGbGV4aWJpbGl0eTsKICAgICAgICAgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSBpbmZsZXhp YmxlSXRlbXM7Ci0gICAgICAgIFdURjo6VmVjdG9yPExheW91dFVuaXQ+IGNoaWxkU2l6ZXM7Cisg ICAgICAgIFZlY3RvcjxMYXlvdXRVbml0PiBjaGlsZFNpemVzOwogICAgICAgICB3aGlsZSAoIXJl c29sdmVGbGV4aWJsZUxlbmd0aHMoZmxleFNpZ24sIG9yZGVyZWRDaGlsZHJlbiwgYXZhaWxhYmxl RnJlZVNwYWNlLCB0b3RhbEZsZXhHcm93LCB0b3RhbFdlaWdodGVkRmxleFNocmluaywgaW5mbGV4 aWJsZUl0ZW1zLCBjaGlsZFNpemVzKSkgewogICAgICAgICAgICAgQVNTRVJUKHRvdGFsRmxleEdy b3cgPj0gMCAmJiB0b3RhbFdlaWdodGVkRmxleFNocmluayA+PSAwKTsKICAgICAgICAgICAgIEFT U0VSVChpbmZsZXhpYmxlSXRlbXMuc2l6ZSgpID4gMCk7CkBAIC05NDksNyArOTQ5LDcgQEAgYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU5leHRGbGV4TGluZShPcmRlckl0ZXJhdG9yJiBp dGVyYXRvciwgT3JkZXJlZEZsZXgKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBSZW5kZXJG bGV4aWJsZUJveDo6ZnJlZXplVmlvbGF0aW9ucyhjb25zdCBXVEY6OlZlY3RvcjxWaW9sYXRpb24+ JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYgdG90 YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZs ZXhJdGVtU2l6ZSYgaW5mbGV4aWJsZUl0ZW1zKQordm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6ZnJl ZXplVmlvbGF0aW9ucyhjb25zdCBWZWN0b3I8VmlvbGF0aW9uPiYgdmlvbGF0aW9ucywgTGF5b3V0 VW5pdCYgYXZhaWxhYmxlRnJlZVNwYWNlLCBkb3VibGUmIHRvdGFsRmxleEdyb3csIGRvdWJsZSYg dG90YWxXZWlnaHRlZEZsZXhTaHJpbmssIEluZmxleGlibGVGbGV4SXRlbVNpemUmIGluZmxleGli bGVJdGVtcykKIHsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHZpb2xhdGlvbnMuc2l6ZSgp OyArK2kpIHsKICAgICAgICAgUmVuZGVyQm94KiBjaGlsZCA9IHZpb2xhdGlvbnNbaV0uY2hpbGQ7 CkBAIC05NjMsMTMgKzk2MywxMyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9s YXRpb25zKGNvbnN0IFdURjo6VmVjdG9yPFZpb2xhdGlvbj4mIHZpb2xhdGlvbgogfQogCiAvLyBS ZXR1cm5zIHRydWUgaWYgd2Ugc3VjY2Vzc2Z1bGx5IHJhbiB0aGUgYWxnb3JpdGhtIGFuZCBzaXpl ZCB0aGUgZmxleCBpdGVtcy4KLWJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJlc29sdmVGbGV4aWJs ZUxlbmd0aHMoRmxleFNpZ24gZmxleFNpZ24sIGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNo aWxkcmVuLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4 R3JvdywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZsZXhJdGVt U2l6ZSYgaW5mbGV4aWJsZUl0ZW1zLCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXpl cykKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJlc29sdmVGbGV4aWJsZUxlbmd0aHMoRmxleFNp Z24gZmxleFNpZ24sIGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBMYXlvdXRV bml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0 b3RhbFdlaWdodGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYgaW5mbGV4aWJs ZUl0ZW1zLCBWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMpCiB7CiAgICAgY2hpbGRTaXpl cy5jbGVhcigpOwogICAgIExheW91dFVuaXQgdG90YWxWaW9sYXRpb24gPSAwOwogICAgIExheW91 dFVuaXQgdXNlZEZyZWVTcGFjZSA9IDA7Ci0gICAgV1RGOjpWZWN0b3I8VmlvbGF0aW9uPiBtaW5W aW9sYXRpb25zOwotICAgIFdURjo6VmVjdG9yPFZpb2xhdGlvbj4gbWF4VmlvbGF0aW9uczsKKyAg ICBWZWN0b3I8VmlvbGF0aW9uPiBtaW5WaW9sYXRpb25zOworICAgIFZlY3RvcjxWaW9sYXRpb24+ IG1heFZpb2xhdGlvbnM7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbi5zaXpl KCk7ICsraSkgewogICAgICAgICBSZW5kZXJCb3gqIGNoaWxkID0gY2hpbGRyZW5baV07CiAgICAg ICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKQEAgLTExMDUsNyArMTEw NSw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnJlc2V0QXV0b01hcmdpbnNBbmRMb2dpY2Fs VG9wSW5Dcm9zc0F4aXMoUmVuZGVyQm94KiBjaGlsCiAgICAgICAgIGNoaWxkLT51cGRhdGVMb2dp Y2FsSGVpZ2h0KCk7CiB9CiAKLXZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl Q2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBjb25zdCBPcmRlcmVkRmxleEl0 ZW1MaXN0JiBjaGlsZHJlbiwgY29uc3QgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6 ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBXVEY6OlZlY3RvcjxMaW5lQ29udGV4 dD4mIGxpbmVDb250ZXh0cykKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl Q2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBjb25zdCBPcmRlcmVkRmxleEl0 ZW1MaXN0JiBjaGlsZHJlbiwgY29uc3QgVmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNpemVzLCBM YXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgVmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNv bnRleHRzKQogewogICAgIEFTU0VSVChjaGlsZFNpemVzLnNpemUoKSA9PSBjaGlsZHJlbi5zaXpl KCkpOwogCkBAIC0xMjQxLDcgKzEyNDEsNyBAQCBzdGF0aWMgTGF5b3V0VW5pdCBhbGlnbkNvbnRl bnRTcGFjZUJldHdlZW5DaGlsZHJlbihMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZQogICAg IHJldHVybiAwOwogfQogCi12b2lkIFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkZsZXhMaW5lcyhP cmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgV1RGOjpWZWN0b3I8TGluZUNvbnRleHQ+JiBsaW5lQ29u dGV4dHMpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkZsZXhMaW5lcyhPcmRlckl0ZXJh dG9yJiBpdGVyYXRvciwgVmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNvbnRleHRzKQogewogICAg IGlmICghaXNNdWx0aWxpbmUoKSB8fCBzdHlsZSgpLT5hbGlnbkNvbnRlbnQoKSA9PSBBbGlnbkNv bnRlbnRGbGV4U3RhcnQpCiAgICAgICAgIHJldHVybjsKQEAgLTEyNzksMTAgKzEyNzksMTAgQEAg dm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0QWxpZ25tZW50Rm9yQ2hpbGQoUmVuZGVyQm94 KiBjaGlsZCwgTGF5b3V0VW5pdCBkZWwKICAgICBzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxk KGNoaWxkLCBmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNoaWxkKSArIExheW91dFNpemUoMCwg ZGVsdGEpKTsKIH0KIAotdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YWxpZ25DaGlsZHJlbihPcmRl ckl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgV1RGOjpWZWN0b3I8TGluZUNvbnRleHQ+JiBsaW5l Q29udGV4dHMpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxkcmVuKE9yZGVySXRl cmF0b3ImIGl0ZXJhdG9yLCBjb25zdCBWZWN0b3I8TGluZUNvbnRleHQ+JiBsaW5lQ29udGV4dHMp CiB7CiAgICAgLy8gS2VlcCB0cmFjayBvZiB0aGUgc3BhY2UgYmV0d2VlbiB0aGUgYmFzZWxpbmUg ZWRnZSBhbmQgdGhlIGFmdGVyIGVkZ2Ugb2YgdGhlIGJveCBmb3IgZWFjaCBsaW5lLgotICAgIFdU Rjo6VmVjdG9yPExheW91dFVuaXQ+IG1pbk1hcmdpbkFmdGVyQmFzZWxpbmVzOworICAgIFZlY3Rv cjxMYXlvdXRVbml0PiBtaW5NYXJnaW5BZnRlckJhc2VsaW5lczsKIAogICAgIFJlbmRlckJveCog Y2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOwogICAgIGZvciAoc2l6ZV90IGxpbmVOdW1iZXIgPSAw OyBsaW5lTnVtYmVyIDwgbGluZUNvbnRleHRzLnNpemUoKTsgKytsaW5lTnVtYmVyKSB7CkBAIC0x Mzk4LDcgKzEzOTgsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmbGlwRm9yUmlnaHRUb0xl ZnRDb2x1bW4oT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IpCiAgICAgfQogfQogCi12b2lkIFJlbmRl ckZsZXhpYmxlQm94OjpmbGlwRm9yV3JhcFJldmVyc2UoT3JkZXJJdGVyYXRvciYgaXRlcmF0b3Is IGNvbnN0IFdURjo6VmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNvbnRleHRzLCBMYXlvdXRVbml0 IGNyb3NzQXhpc1N0YXJ0RWRnZSkKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmZsaXBGb3JXcmFw UmV2ZXJzZShPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgVmVjdG9yPExpbmVDb250ZXh0 PiYgbGluZUNvbnRleHRzLCBMYXlvdXRVbml0IGNyb3NzQXhpc1N0YXJ0RWRnZSkKIHsKICAgICBM YXlvdXRVbml0IGNvbnRlbnRFeHRlbnQgPSBjcm9zc0F4aXNDb250ZW50RXh0ZW50KCk7CiAgICAg UmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IGQ0MDVkMjQuLjkxZGQxY2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC03Miw4ICs3 Miw4IEBAIHByaXZhdGU6CiAgICAgdHlwZWRlZiBIYXNoU2V0PGludCwgRGVmYXVsdEhhc2g8aW50 Pjo6SGFzaCwgT3JkZXJIYXNoVHJhaXRzPiBPcmRlckhhc2hTZXQ7CiAKICAgICBjbGFzcyBPcmRl ckl0ZXJhdG9yOwotICAgIHR5cGVkZWYgV1RGOjpIYXNoTWFwPGNvbnN0IFJlbmRlckJveCosIExh eW91dFVuaXQ+IEluZmxleGlibGVGbGV4SXRlbVNpemU7Ci0gICAgdHlwZWRlZiBXVEY6OlZlY3Rv cjxSZW5kZXJCb3gqPiBPcmRlcmVkRmxleEl0ZW1MaXN0OworICAgIHR5cGVkZWYgSGFzaE1hcDxj b25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0PiBJbmZsZXhpYmxlRmxleEl0ZW1TaXplOworICAg IHR5cGVkZWYgVmVjdG9yPFJlbmRlckJveCo+IE9yZGVyZWRGbGV4SXRlbUxpc3Q7CiAKICAgICBz dHJ1Y3QgTGluZUNvbnRleHQ7CiAgICAgc3RydWN0IFZpb2xhdGlvbjsKQEAgLTExOCwxMiArMTE4 LDEyIEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtYWluQXhpc1Njcm9sbGJhckV4dGVudEZv ckNoaWxkKFJlbmRlckJveCogY2hpbGQpIGNvbnN0OwogICAgIExheW91dFVuaXQgcHJlZmVycmVk TWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCk7CiAKLSAgICB2 b2lkIGxheW91dEZsZXhJdGVtcyhPcmRlckl0ZXJhdG9yJiwgV1RGOjpWZWN0b3I8TGluZUNvbnRl eHQ+Jik7CisgICAgdm9pZCBsYXlvdXRGbGV4SXRlbXMoT3JkZXJJdGVyYXRvciYsIFZlY3RvcjxM aW5lQ29udGV4dD4mKTsKICAgICBMYXlvdXRVbml0IGF1dG9NYXJnaW5PZmZzZXRJbk1haW5BeGlz KGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3Bh Y2UpOwogICAgIHZvaWQgdXBkYXRlQXV0b01hcmdpbnNJbk1haW5BeGlzKFJlbmRlckJveCogY2hp bGQsIExheW91dFVuaXQgYXV0b01hcmdpbk9mZnNldCk7CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2lu c0luQ3Jvc3NBeGlzKFJlbmRlckJveCogY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgdXBkYXRlQXV0 b01hcmdpbnNJbkNyb3NzQXhpcyhSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGF2YWlsYWJs ZUFsaWdubWVudFNwYWNlKTsKLSAgICB2b2lkIHJlcG9zaXRpb25Mb2dpY2FsSGVpZ2h0RGVwZW5k ZW50RmxleEl0ZW1zKE9yZGVySXRlcmF0b3ImLCBXVEY6OlZlY3RvcjxMaW5lQ29udGV4dD4mLCBM YXlvdXRVbml0JiBvbGRDbGllbnRBZnRlckVkZ2UpOworICAgIHZvaWQgcmVwb3NpdGlvbkxvZ2lj YWxIZWlnaHREZXBlbmRlbnRGbGV4SXRlbXMoT3JkZXJJdGVyYXRvciYsIFZlY3RvcjxMaW5lQ29u dGV4dD4mLCBMYXlvdXRVbml0JiBvbGRDbGllbnRBZnRlckVkZ2UpOwogICAgIHZvaWQgY2xlYXJD aGlsZE92ZXJyaWRlU2l6ZXMoKTsKICAgICB2b2lkIGFwcGVuZENoaWxkRnJhbWVSZWN0cyhDaGls ZEZyYW1lUmVjdHMmKTsKICAgICB2b2lkIHJlcGFpbnRDaGlsZHJlbkR1cmluZ0xheW91dElmTW92 ZWQoY29uc3QgQ2hpbGRGcmFtZVJlY3RzJik7CkBAIC0xMzYsMjEgKzEzNiwyMSBAQCBwcml2YXRl OgogICAgIExheW91dFVuaXQgYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCos IExheW91dFVuaXQgY2hpbGRTaXplKTsKICAgICBib29sIGNvbXB1dGVOZXh0RmxleExpbmUoT3Jk ZXJJdGVyYXRvciYsIE9yZGVyZWRGbGV4SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbiwgTGF5b3V0 VW5pdCYgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91 YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaywgTGF5b3V0VW5pdCYgbWluTWF4QXBwbGllZE1h aW5BeGlzRXh0ZW50KTsKIAotICAgIGJvb2wgcmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2ln biwgY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVT cGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBkb3VibGUmIHRvdGFsV2VpZ2h0ZWRGbGV4U2hy aW5rLCBJbmZsZXhpYmxlRmxleEl0ZW1TaXplJiwgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNo aWxkU2l6ZXMpOwotICAgIHZvaWQgZnJlZXplVmlvbGF0aW9ucyhjb25zdCBXVEY6OlZlY3RvcjxW aW9sYXRpb24+JiwgTGF5b3V0VW5pdCYgYXZhaWxhYmxlRnJlZVNwYWNlLCBkb3VibGUmIHRvdGFs RmxleEdyb3csIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmssIEluZmxleGlibGVGbGV4 SXRlbVNpemUmKTsKKyAgICBib29sIHJlc29sdmVGbGV4aWJsZUxlbmd0aHMoRmxleFNpZ24sIGNv bnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2Us IGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaywg SW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYsIFZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcyk7 CisgICAgdm9pZCBmcmVlemVWaW9sYXRpb25zKGNvbnN0IFZlY3RvcjxWaW9sYXRpb24+JiwgTGF5 b3V0VW5pdCYgYXZhaWxhYmxlRnJlZVNwYWNlLCBkb3VibGUmIHRvdGFsRmxleEdyb3csIGRvdWJs ZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmssIEluZmxleGlibGVGbGV4SXRlbVNpemUmKTsKIAog ICAgIHZvaWQgcmVzZXRBdXRvTWFyZ2luc0FuZExvZ2ljYWxUb3BJbkNyb3NzQXhpcyhSZW5kZXJC b3gqKTsKICAgICBib29sIG5lZWRUb1N0cmV0Y2hDaGlsZChSZW5kZXJCb3gqKTsKICAgICB2b2lk IHNldExvZ2ljYWxPdmVycmlkZVNpemUoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGls ZFByZWZlcnJlZFNpemUpOwogICAgIHZvaWQgcHJlcGFyZUNoaWxkRm9yUG9zaXRpb25lZExheW91 dChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IG1haW5BeGlzT2Zmc2V0LCBMYXlvdXRVbml0 IGNyb3NzQXhpc09mZnNldCwgUG9zaXRpb25lZExheW91dE1vZGUpOwogICAgIHNpemVfdCBudW1i ZXJPZkluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihjb25zdCBPcmRlcmVkRmxleEl0ZW1MaXN0Jikg Y29uc3Q7Ci0gICAgdm9pZCBsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKExheW91dFVuaXQmIGNyb3Nz QXhpc09mZnNldCwgY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIGNvbnN0IFdURjo6VmVjdG9y PExheW91dFVuaXQ+JiBjaGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwg V1RGOjpWZWN0b3I8TGluZUNvbnRleHQ+Jik7CisgICAgdm9pZCBsYXlvdXRBbmRQbGFjZUNoaWxk cmVuKExheW91dFVuaXQmIGNyb3NzQXhpc09mZnNldCwgY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlz dCYsIGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFp bGFibGVGcmVlU3BhY2UsIFZlY3RvcjxMaW5lQ29udGV4dD4mKTsKICAgICB2b2lkIGxheW91dENv bHVtblJldmVyc2UoY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIExheW91dFVuaXQgY3Jvc3NB eGlzT2Zmc2V0LCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSk7Ci0gICAgdm9pZCBhbGln bkZsZXhMaW5lcyhPcmRlckl0ZXJhdG9yJiwgV1RGOjpWZWN0b3I8TGluZUNvbnRleHQ+Jik7Ci0g ICAgdm9pZCBhbGlnbkNoaWxkcmVuKE9yZGVySXRlcmF0b3ImLCBjb25zdCBXVEY6OlZlY3RvcjxM aW5lQ29udGV4dD4mKTsKKyAgICB2b2lkIGFsaWduRmxleExpbmVzKE9yZGVySXRlcmF0b3ImLCBW ZWN0b3I8TGluZUNvbnRleHQ+Jik7CisgICAgdm9pZCBhbGlnbkNoaWxkcmVuKE9yZGVySXRlcmF0 b3ImLCBjb25zdCBWZWN0b3I8TGluZUNvbnRleHQ+Jik7CiAgICAgdm9pZCBhcHBseVN0cmV0Y2hB bGlnbm1lbnRUb0NoaWxkKFJlbmRlckJveCosIExheW91dFVuaXQgbGluZUNyb3NzQXhpc0V4dGVu dCk7CiAgICAgdm9pZCBmbGlwRm9yUmlnaHRUb0xlZnRDb2x1bW4oT3JkZXJJdGVyYXRvciYpOwot ICAgIHZvaWQgZmxpcEZvcldyYXBSZXZlcnNlKE9yZGVySXRlcmF0b3ImLCBjb25zdCBXVEY6OlZl Y3RvcjxMaW5lQ29udGV4dD4mLCBMYXlvdXRVbml0IGNyb3NzQXhpc1N0YXJ0RWRnZSk7CisgICAg dm9pZCBmbGlwRm9yV3JhcFJldmVyc2UoT3JkZXJJdGVyYXRvciYsIGNvbnN0IFZlY3RvcjxMaW5l Q29udGV4dD4mLCBMYXlvdXRVbml0IGNyb3NzQXhpc1N0YXJ0RWRnZSk7CiAKICAgICBPd25QdHI8 T3JkZXJJdGVyYXRvcj4gbV9vcmRlckl0ZXJhdG9yOwogICAgIGludCBtX251bWJlck9mSW5GbG93 Q2hpbGRyZW5PbkZpcnN0TGluZTsK