193621 2019-01-20 11:58:14 -0800 On RenderBox, make client sizing be derived from padding box sizing 2019-01-20 17:07:30 -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 dbates simon.fraser webkit-bug-importer oldest_to_newest 1496336 0 simon.fraser 2019-01-20 11:58:14 -0800 On RenderBox, make client sizing be derived from padding box sizing 1496337 1 359641 simon.fraser 2019-01-20 12:00:39 -0800 Created attachment 359641 Patch 1496389 2 simon.fraser 2019-01-20 14:10:51 -0800 wincairo failure is "No space left on device" 1496452 3 359641 commit-queue 2019-01-20 17:06:57 -0800 Comment on attachment 359641 Patch Clearing flags on attachment: 359641 Committed r240218: <https://trac.webkit.org/changeset/240218> 1496453 4 commit-queue 2019-01-20 17:06:58 -0800 All reviewed patches have been landed. Closing bug. 1496454 5 webkit-bug-importer 2019-01-20 17:07:30 -0800 <rdar://problem/47418190> 359641 2019-01-20 12:00:39 -0800 2019-01-20 17:06:57 -0800 Patch bug-193621-20190120120038.patch text/plain 13069 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA0MWRjMmQxNjQ1ZjQ0 OTc0ZjBiZDQ5YjQ0NTczYzBiNjM3NjNkNi4uODMxNGE3MGQ1Mzk2OWJkNjM0MWYzYzE4N2YxY2Y2 NTE4YmE5NmQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAxLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE9uIFJlbmRlckJv eCwgbWFrZSBjbGllbnQgc2l6aW5nIGJlIGRlcml2ZWQgZnJvbSBwYWRkaW5nIGJveCBzaXppbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzYyMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgbmV2ZXIg bGlrZWQgaG93IGNsaWVudFdpZHRoL0hlaWdodCwgYW4gSUUtb3JpZ2luYXRlZCB0ZXJtLCB3YXMg dXNlZCBhcyB0aGUgYmFzaXMKKyAgICAgICAgZm9yIHZhcmlvdXMgUmVuZGVyQm94IGdlb21ldHJ5 IGZ1bmN0aW9ucy4KKworICAgICAgICBGaXggYnkgYWRkaW5nIHNvbWUgZnVuY3Rpb25zIHdoaWNo IHJldHVybiB0aGUgZGltZW5zaW9ucyBvZiB0aGUgcGFkZGluZyBib3ggKHdoaWNoCisgICAgICAg IGlzIHRoZSBpbnNpZGUgb2YgdGhlIGJvcmRlciBhbmQgYW55IHNjcm9sbGJhciksIGFuZCBkZWZp bmUgY2xpZW50V2lkdGgvSGVpZ2h0IGluCisgICAgICAgIHRlcm1zIG9mIHRoZW0uCisKKyAgICAg ICAgQWxzbyBhZGQgcGFkZGluZ0JveFJlY3RJbmNsdWRpbmdTY3JvbGxiYXIoKSBmdW5jdGlvbiB0 aGF0IGlzIHVzZWQgYnkgY29tcG9zaXRpbmcgY29kZS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjbGllbnRXaWR0aCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNsaWVudEhlaWdodCBjb25zdCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94Ojpib3JkZXJCb3hSZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6Y29tcHV0ZWRDU1NDb250ZW50Qm94UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OmNvbnRlbnRXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3g6OmNvbnRlbnRIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpw YWRkaW5nQm94V2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwYWRk aW5nQm94SGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6cGFkZGlu Z0JveFJlY3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwYWRkaW5nQm94 UmVjdEluY2x1ZGluZ1Njcm9sbGJhciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3g6Omhhc0hvcml6b250YWxPdmVyZmxvdyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6Omhhc1ZlcnRpY2FsT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjpjb21wdXRlUGFyZW50R3JhcGhpY3NMYXllclJlY3QgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHZW9tZXRyeSk6CisKIDIwMTktMDEtMTgg IEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2ZXJ0 IHIyMzg4MTUsIGl0IGJyb2tlIFdLMSB2aWRlbyBmdWxsc2NyZWVuIG9uIE1hYwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAwNmFlYmFmNjVkNWRmMTliN2IwMmRmMmFl ZjYxMjRlNmE2NGY0NDJjLi5kMzg3MjBjOTE1OWYwYmUzNGVlNmQyZWFjNmFhZmU4YTI1ZWNiZjUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNTI2LDEyICs1MjYs MTIgQEAgdm9pZCBSZW5kZXJCb3g6OmxheW91dCgpCiAvLyBleGNsdWRpbmcgYm9yZGVyIGFuZCBz Y3JvbGxiYXIuCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y2xpZW50V2lkdGgoKSBjb25zdAogewot ICAgIHJldHVybiB3aWR0aCgpIC0gYm9yZGVyTGVmdCgpIC0gYm9yZGVyUmlnaHQoKSAtIHZlcnRp Y2FsU2Nyb2xsYmFyV2lkdGgoKTsKKyAgICByZXR1cm4gcGFkZGluZ0JveFdpZHRoKCk7CiB9CiAK IExheW91dFVuaXQgUmVuZGVyQm94OjpjbGllbnRIZWlnaHQoKSBjb25zdAogewotICAgIHJldHVy biBoZWlnaHQoKSAtIGJvcmRlclRvcCgpIC0gYm9yZGVyQm90dG9tKCkgLSBob3Jpem9udGFsU2Ny b2xsYmFySGVpZ2h0KCk7CisgICAgcmV0dXJuIHBhZGRpbmdCb3hIZWlnaHQoKTsKIH0KIAogaW50 IFJlbmRlckJveDo6c2Nyb2xsV2lkdGgoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCmluZGV4IDU1MTA2ODUyOTQyOTRhYmY4ZjVkNmViMmEwY2FjMjEwNmY2YTZjMTIuLjlm Y2QyMzk5MTFhZjNhMzAwOGUwMTUyNjMyMDAzMGQ5NzgxYTY3Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKQEAgLTE1MSw3ICsxNTEsNiBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiBMYXlvdXRSZWN0KC1tYXJnaW5MZWZ0LCAtbWFyZ2luVG9wLCBzaXplKCkud2lkdGgoKSAr IG1hcmdpbkxlZnQgKyBtYXJnaW5SaWdodCwgc2l6ZSgpLmhlaWdodCgpICsgbWFyZ2luVG9wICsg bWFyZ2luQm90dG9tKTsKICAgICB9CiAgICAgTGF5b3V0UmVjdCBib3JkZXJCb3hSZWN0KCkgY29u c3QgeyByZXR1cm4gTGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBzaXplKCkpOyB9Ci0gICAgTGF5 b3V0UmVjdCBwYWRkaW5nQm94UmVjdCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFJlY3QoYm9yZGVy TGVmdCgpLCBib3JkZXJUb3AoKSwgY29udGVudFdpZHRoKCkgKyBwYWRkaW5nTGVmdCgpICsgcGFk ZGluZ1JpZ2h0KCksIGNvbnRlbnRIZWlnaHQoKSArIHBhZGRpbmdUb3AoKSArIHBhZGRpbmdCb3R0 b20oKSk7IH0KICAgICBMYXlvdXRSZWN0IGJvcmRlckJvdW5kaW5nQm94KCkgY29uc3QgZmluYWwg eyByZXR1cm4gYm9yZGVyQm94UmVjdCgpOyB9CiAKICAgICBXRUJDT1JFX0VYUE9SVCBSb3VuZGVk UmVjdDo6UmFkaWkgYm9yZGVyUmFkaWkoKSBjb25zdDsKQEAgLTE2Nyw3ICsxNjYsNyBAQCBwdWJs aWM6CiAKICAgICAvLyBUaGlzIHJldHVybnMgdGhlIGNvbnRlbnQgYXJlYSBvZiB0aGUgYm94IChl eGNsdWRpbmcgcGFkZGluZyBhbmQgYm9yZGVyKS4gVGhlIG9ubHkgZGlmZmVyZW5jZSB3aXRoIGNv bnRlbnRCb3hSZWN0IGlzIHRoYXQgY29tcHV0ZWRDU1NDb250ZW50Qm94UmVjdAogICAgIC8vIGRv ZXMgaW5jbHVkZSB0aGUgaW50cmluc2ljIHBhZGRpbmcgaW4gdGhlIGNvbnRlbnQgYm94IGFzIHRo aXMgaXMgd2hhdCBzb21lIGNhbGxlcnMgZXhwZWN0IChsaWtlIGdldENvbXB1dGVkU3R5bGUpLgot ICAgIExheW91dFJlY3QgY29tcHV0ZWRDU1NDb250ZW50Qm94UmVjdCgpIGNvbnN0IHsgcmV0dXJu IExheW91dFJlY3QoYm9yZGVyTGVmdCgpICsgY29tcHV0ZWRDU1NQYWRkaW5nTGVmdCgpLCBib3Jk ZXJUb3AoKSArIGNvbXB1dGVkQ1NTUGFkZGluZ1RvcCgpLCBjbGllbnRXaWR0aCgpIC0gY29tcHV0 ZWRDU1NQYWRkaW5nTGVmdCgpIC0gY29tcHV0ZWRDU1NQYWRkaW5nUmlnaHQoKSwgY2xpZW50SGVp Z2h0KCkgLSBjb21wdXRlZENTU1BhZGRpbmdUb3AoKSAtIGNvbXB1dGVkQ1NTUGFkZGluZ0JvdHRv bSgpKTsgfQorICAgIExheW91dFJlY3QgY29tcHV0ZWRDU1NDb250ZW50Qm94UmVjdCgpIGNvbnN0 IHsgcmV0dXJuIExheW91dFJlY3QoYm9yZGVyTGVmdCgpICsgY29tcHV0ZWRDU1NQYWRkaW5nTGVm dCgpLCBib3JkZXJUb3AoKSArIGNvbXB1dGVkQ1NTUGFkZGluZ1RvcCgpLCBwYWRkaW5nQm94V2lk dGgoKSAtIGNvbXB1dGVkQ1NTUGFkZGluZ0xlZnQoKSAtIGNvbXB1dGVkQ1NTUGFkZGluZ1JpZ2h0 KCksIHBhZGRpbmdCb3hIZWlnaHQoKSAtIGNvbXB1dGVkQ1NTUGFkZGluZ1RvcCgpIC0gY29tcHV0 ZWRDU1NQYWRkaW5nQm90dG9tKCkpOyB9CiAKICAgICAvLyBCb3VuZHMgb2YgdGhlIG91dGxpbmUg Ym94IGluIGFic29sdXRlIGNvb3Jkcy4gUmVzcGVjdHMgdHJhbnNmb3JtcwogICAgIExheW91dFJl Y3Qgb3V0bGluZUJvdW5kc0ZvclJlcGFpbnQoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCog LypyZXBhaW50Q29udGFpbmVyKi8sIGNvbnN0IFJlbmRlckdlb21ldHJ5TWFwKikgY29uc3QgZmlu YWw7CkBAIC0yMTMsMTEgKzIxMiwxNiBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVMYXllclRy YW5zZm9ybSgpOwogCiAgICAgTGF5b3V0U2l6ZSBjb250ZW50U2l6ZSgpIGNvbnN0IHsgcmV0dXJu IHsgY29udGVudFdpZHRoKCksIGNvbnRlbnRIZWlnaHQoKSB9OyB9Ci0gICAgTGF5b3V0VW5pdCBj b250ZW50V2lkdGgoKSBjb25zdCB7IHJldHVybiBjbGllbnRXaWR0aCgpIC0gcGFkZGluZ0xlZnQo KSAtIHBhZGRpbmdSaWdodCgpOyB9Ci0gICAgTGF5b3V0VW5pdCBjb250ZW50SGVpZ2h0KCkgY29u c3QgeyByZXR1cm4gY2xpZW50SGVpZ2h0KCkgLSBwYWRkaW5nVG9wKCkgLSBwYWRkaW5nQm90dG9t KCk7IH0KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHBhZGRp bmdCb3hXaWR0aCgpIC0gcGFkZGluZ0xlZnQoKSAtIHBhZGRpbmdSaWdodCgpOyB9CisgICAgTGF5 b3V0VW5pdCBjb250ZW50SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gcGFkZGluZ0JveEhlaWdodCgp IC0gcGFkZGluZ1RvcCgpIC0gcGFkZGluZ0JvdHRvbSgpOyB9CiAgICAgTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpID8gY29udGVudFdpZHRoKCkgOiBjb250ZW50SGVpZ2h0KCk7IH0KICAgICBMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hv cml6b250YWxXcml0aW5nTW9kZSgpID8gY29udGVudEhlaWdodCgpIDogY29udGVudFdpZHRoKCk7 IH0KIAorICAgIExheW91dFVuaXQgcGFkZGluZ0JveFdpZHRoKCkgY29uc3QgeyByZXR1cm4gd2lk dGgoKSAtIGJvcmRlckxlZnQoKSAtIGJvcmRlclJpZ2h0KCkgLSB2ZXJ0aWNhbFNjcm9sbGJhcldp ZHRoKCk7IH0KKyAgICBMYXlvdXRVbml0IHBhZGRpbmdCb3hIZWlnaHQoKSBjb25zdCB7IHJldHVy biBoZWlnaHQoKSAtIGJvcmRlclRvcCgpIC0gYm9yZGVyQm90dG9tKCkgLSBob3Jpem9udGFsU2Ny b2xsYmFySGVpZ2h0KCk7IH0KKyAgICBMYXlvdXRSZWN0IHBhZGRpbmdCb3hSZWN0KCkgY29uc3Qg eyByZXR1cm4gTGF5b3V0UmVjdChib3JkZXJMZWZ0KCksIGJvcmRlclRvcCgpLCBwYWRkaW5nQm94 V2lkdGgoKSwgcGFkZGluZ0JveEhlaWdodCgpKTsgfQorICAgIExheW91dFJlY3QgcGFkZGluZ0Jv eFJlY3RJbmNsdWRpbmdTY3JvbGxiYXIoKSBjb25zdCB7IHJldHVybiBMYXlvdXRSZWN0KGJvcmRl ckxlZnQoKSwgYm9yZGVyVG9wKCksIHdpZHRoKCkgLSBib3JkZXJMZWZ0KCkgLSBib3JkZXJSaWdo dCgpLCBoZWlnaHQoKSAtIGJvcmRlclRvcCgpIC0gYm9yZGVyQm90dG9tKCkpOyB9CisKICAgICAv LyBJRSBleHRlbnNpb25zLiBVc2VkIHRvIGNhbGN1bGF0ZSBvZmZzZXRXaWR0aC9IZWlnaHQuICBP dmVycmlkZGVuIGJ5IGlubGluZXMgKFJlbmRlckZsb3cpCiAgICAgLy8gdG8gcmV0dXJuIHRoZSBy ZW1haW5pbmcgd2lkdGggb24gYSBnaXZlbiBsaW5lIChhbmQgdGhlIGhlaWdodCBvZiBhIHNpbmds ZSBsaW5lKS4KICAgICBMYXlvdXRVbml0IG9mZnNldFdpZHRoKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gd2lkdGgoKTsgfQpAQCAtNDQ3LDggKzQ1MSw4IEBAIG92ZXJyaWRlOwogICAgIExheW91 dFVuaXQgYXZhaWxhYmxlV2lkdGgoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkgPyBhdmFpbGFibGVMb2dpY2FsV2lkdGgoKSA6IGF2YWlsYWJsZUxvZ2lj YWxIZWlnaHQoSW5jbHVkZU1hcmdpbkJvcmRlclBhZGRpbmcpOyB9CiAgICAgTGF5b3V0VW5pdCBh dmFpbGFibGVIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgPyBhdmFpbGFibGVMb2dpY2FsSGVpZ2h0KEluY2x1ZGVNYXJnaW5Cb3JkZXJQYWRk aW5nKSA6IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpOyB9CiAKLSAgICB2aXJ0dWFsIGludCB2ZXJ0 aWNhbFNjcm9sbGJhcldpZHRoKCkgY29uc3Q7Ci0gICAgaW50IGhvcml6b250YWxTY3JvbGxiYXJI ZWlnaHQoKSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIGludCB2ZXJ0aWNhbFNj cm9sbGJhcldpZHRoKCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgaW50IGhvcml6b250YWxT Y3JvbGxiYXJIZWlnaHQoKSBjb25zdDsKICAgICBpbnQgaW50cmluc2ljU2Nyb2xsYmFyTG9naWNh bFdpZHRoKCkgY29uc3Q7CiAgICAgaW50IHNjcm9sbGJhckxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZlcnRpY2FsU2Nyb2xs YmFyV2lkdGgoKSA6IGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoKTsgfQogICAgIGludCBzY3Jv bGxiYXJMb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5pc0hvcml6b250YWxX cml0aW5nTW9kZSgpID8gaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpIDogdmVydGljYWxTY3Jv bGxiYXJXaWR0aCgpOyB9CkBAIC00NzIsOCArNDc2LDggQEAgb3ZlcnJpZGU7CiAgICAgYm9vbCBz Y3JvbGxzT3ZlcmZsb3dYKCkgY29uc3QgeyByZXR1cm4gaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHN0 eWxlKCkub3ZlcmZsb3dYKCkgPT0gT3ZlcmZsb3c6OlNjcm9sbCB8fCBzdHlsZSgpLm92ZXJmbG93 WCgpID09IE92ZXJmbG93OjpBdXRvKTsgfQogICAgIGJvb2wgc2Nyb2xsc092ZXJmbG93WSgpIGNv bnN0IHsgcmV0dXJuIGhhc092ZXJmbG93Q2xpcCgpICYmIChzdHlsZSgpLm92ZXJmbG93WSgpID09 IE92ZXJmbG93OjpTY3JvbGwgfHwgc3R5bGUoKS5vdmVyZmxvd1koKSA9PSBPdmVyZmxvdzo6QXV0 byk7IH0KIAotICAgIGJvb2wgaGFzSG9yaXpvbnRhbE92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4g c2Nyb2xsV2lkdGgoKSAhPSByb3VuZFRvSW50KGNsaWVudFdpZHRoKCkpOyB9Ci0gICAgYm9vbCBo YXNWZXJ0aWNhbE92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gc2Nyb2xsSGVpZ2h0KCkgIT0gcm91 bmRUb0ludChjbGllbnRIZWlnaHQoKSk7IH0KKyAgICBib29sIGhhc0hvcml6b250YWxPdmVyZmxv dygpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbFdpZHRoKCkgIT0gcm91bmRUb0ludChwYWRkaW5nQm94 V2lkdGgoKSk7IH0KKyAgICBib29sIGhhc1ZlcnRpY2FsT3ZlcmZsb3coKSBjb25zdCB7IHJldHVy biBzY3JvbGxIZWlnaHQoKSAhPSByb3VuZFRvSW50KHBhZGRpbmdCb3hIZWlnaHQoKSk7IH0KIAog ICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU92ZXJmbG93WCgpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbHNP dmVyZmxvd1goKSAmJiBoYXNIb3Jpem9udGFsT3ZlcmZsb3coKTsgfQogICAgIGJvb2wgaGFzU2Ny b2xsYWJsZU92ZXJmbG93WSgpIGNvbnN0IHsgcmV0dXJuIHNjcm9sbHNPdmVyZmxvd1koKSAmJiBo YXNWZXJ0aWNhbE92ZXJmbG93KCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggOTlhZmQ4ODJiN2YyODJkM2RmNjJiNjE4Y2NlZmI4 MzlmZmY3M2JlOS4uMzFjMzI2ZjlmMTgyNmY5ZWQ1NGFlMTE5ZmNkOTQ4NzdmY2YwMmE4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAg LTk1MCw5ICs5NTAsOSBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyQmFja2luZzo6Y29tcHV0ZVBh cmVudEdyYXBoaWNzTGF5ZXJSZWN0KFJlbmRlckxheWVyKiBjb21wbwogICAgIGlmIChjb21wb3Np dGVkQW5jZXN0b3ItPmhhc0NvbXBvc2l0ZWRTY3JvbGxhYmxlT3ZlcmZsb3coKSkgewogICAgICAg ICBMYXlvdXRSZWN0IGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5kcyA9IGFuY2VzdG9yQmFja2luZ0xh eWVyLT5jb21wb3NpdGVkQm91bmRzKCk7CiAgICAgICAgIGF1dG8mIHJlbmRlckJveCA9IGRvd25j YXN0PFJlbmRlckJveD4oY29tcG9zaXRlZEFuY2VzdG9yLT5yZW5kZXJlcigpKTsKLSAgICAgICAg TGF5b3V0UmVjdCBwYWRkaW5nQm94KHJlbmRlckJveC5ib3JkZXJMZWZ0KCksIHJlbmRlckJveC5i b3JkZXJUb3AoKSwgcmVuZGVyQm94LndpZHRoKCkgLSByZW5kZXJCb3guYm9yZGVyTGVmdCgpIC0g cmVuZGVyQm94LmJvcmRlclJpZ2h0KCksIHJlbmRlckJveC5oZWlnaHQoKSAtIHJlbmRlckJveC5i b3JkZXJUb3AoKSAtIHJlbmRlckJveC5ib3JkZXJCb3R0b20oKSk7CisgICAgICAgIExheW91dFJl Y3QgcGFkZGluZ0JveEluY2x1ZGluZ1Njcm9sbGJhciA9IHJlbmRlckJveC5wYWRkaW5nQm94UmVj dEluY2x1ZGluZ1Njcm9sbGJhcigpOwogICAgICAgICBTY3JvbGxPZmZzZXQgc2Nyb2xsT2Zmc2V0 ID0gY29tcG9zaXRlZEFuY2VzdG9yLT5zY3JvbGxPZmZzZXQoKTsKLSAgICAgICAgcGFyZW50R3Jh cGhpY3NMYXllclJlY3QgPSBMYXlvdXRSZWN0KChwYWRkaW5nQm94LmxvY2F0aW9uKCkgLSB0b0xh eW91dFNpemUoYW5jZXN0b3JDb21wb3NpdGVkQm91bmRzLmxvY2F0aW9uKCkpIC0gdG9MYXlvdXRT aXplKHNjcm9sbE9mZnNldCkpLCBwYWRkaW5nQm94LnNpemUoKSk7CisgICAgICAgIHBhcmVudEdy YXBoaWNzTGF5ZXJSZWN0ID0gTGF5b3V0UmVjdCgocGFkZGluZ0JveEluY2x1ZGluZ1Njcm9sbGJh ci5sb2NhdGlvbigpIC0gdG9MYXlvdXRTaXplKGFuY2VzdG9yQ29tcG9zaXRlZEJvdW5kcy5sb2Nh dGlvbigpKSAtIHRvTGF5b3V0U2l6ZShzY3JvbGxPZmZzZXQpKSwgcGFkZGluZ0JveEluY2x1ZGlu Z1Njcm9sbGJhci5zaXplKCkpOwogICAgIH0KICNlbmRpZgogCkBAIC0xMTc1LDE2ICsxMTc1LDE2 IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHZW9tZXRyeSgpCiAgICAgaWYgKG1f c2Nyb2xsaW5nTGF5ZXIpIHsKICAgICAgICAgQVNTRVJUKG1fc2Nyb2xsaW5nQ29udGVudHNMYXll cik7CiAgICAgICAgIGF1dG8mIHJlbmRlckJveCA9IGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVy ZXIoKSk7Ci0gICAgICAgIExheW91dFJlY3QgcGFkZGluZ0JveChyZW5kZXJCb3guYm9yZGVyTGVm dCgpLCByZW5kZXJCb3guYm9yZGVyVG9wKCksIHJlbmRlckJveC53aWR0aCgpIC0gcmVuZGVyQm94 LmJvcmRlckxlZnQoKSAtIHJlbmRlckJveC5ib3JkZXJSaWdodCgpLCByZW5kZXJCb3guaGVpZ2h0 KCkgLSByZW5kZXJCb3guYm9yZGVyVG9wKCkgLSByZW5kZXJCb3guYm9yZGVyQm90dG9tKCkpOwor ICAgICAgICBMYXlvdXRSZWN0IHBhZGRpbmdCb3hJbmNsdWRpbmdTY3JvbGxiYXIgPSByZW5kZXJC b3gucGFkZGluZ0JveFJlY3RJbmNsdWRpbmdTY3JvbGxiYXIoKTsKICAgICAgICAgU2Nyb2xsT2Zm c2V0IHNjcm9sbE9mZnNldCA9IG1fb3duaW5nTGF5ZXIuc2Nyb2xsT2Zmc2V0KCk7CiAKICAgICAg ICAgLy8gRklYTUU6IG5lZWQgdG8gZG8gc29tZSBwaXhlbCBzbmFwcGluZyBoZXJlLgotICAgICAg ICBtX3Njcm9sbGluZ0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KHBhZGRpbmdCb3gubG9j YXRpb24oKSAtIGNvbXBvc2l0ZWRCb3VuZHMoKS5sb2NhdGlvbigpKSk7CisgICAgICAgIG1fc2Ny b2xsaW5nTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQocGFkZGluZ0JveEluY2x1ZGluZ1Nj cm9sbGJhci5sb2NhdGlvbigpIC0gY29tcG9zaXRlZEJvdW5kcygpLmxvY2F0aW9uKCkpKTsKIAog ICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRTaXplKHJvdW5kZWRJbnRTaXplKExheW91dFNp emUocmVuZGVyQm94LmNsaWVudFdpZHRoKCksIHJlbmRlckJveC5jbGllbnRIZWlnaHQoKSkpKTsK ICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICBGbG9hdFNpemUgb2xkU2Nyb2xsaW5n TGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsKLSAg ICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKEZsb2F0UG9pbnQo KSAtIHBhZGRpbmdCb3gubG9jYXRpb24oKSk7CisgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNl dE9mZnNldEZyb21SZW5kZXJlcihGbG9hdFBvaW50KCkgLSBwYWRkaW5nQm94SW5jbHVkaW5nU2Ny b2xsYmFyLmxvY2F0aW9uKCkpOwogICAgICAgICBib29sIHBhZGRpbmdCb3hPZmZzZXRDaGFuZ2Vk ID0gb2xkU2Nyb2xsaW5nTGF5ZXJPZmZzZXQgIT0gbV9zY3JvbGxpbmdMYXllci0+b2Zmc2V0RnJv bVJlbmRlcmVyKCk7CiAKICAgICAgICAgaWYgKG1fb3duaW5nTGF5ZXIuaXNJblVzZXJTY3JvbGwo KSkgewpAQCAtMTIwNywxNyArMTIwNywxNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBk YXRlR2VvbWV0cnkoKQogICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldFNpemUo c2Nyb2xsU2l6ZSk7CiAgICAgICAgIC8vIFNjcm9sbGluZyB0aGUgY29udGVudCBsYXllciBkb2Vz IG5vdCBuZWVkIHRvIHRyaWdnZXIgYSByZXBhaW50LiBUaGUgb2Zmc2V0IHdpbGwgYmUgY29tcGVu c2F0ZWQgYXdheSBkdXJpbmcgcGFpbnRpbmcuCiAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNM YXllci0+c2V0U2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCwgR3JhcGhpY3NMYXllcjo6RG9udFNl dE5lZWRzRGlzcGxheSk7Ci0gICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0T2Zm c2V0RnJvbVJlbmRlcmVyKHRvTGF5b3V0U2l6ZShwYWRkaW5nQm94LmxvY2F0aW9uKCkpLCBHcmFw aGljc0xheWVyOjpEb250U2V0TmVlZHNEaXNwbGF5KTsKKyAgICAgICAgbV9zY3JvbGxpbmdDb250 ZW50c0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9MYXlvdXRTaXplKHBhZGRpbmdCb3hJ bmNsdWRpbmdTY3JvbGxiYXIubG9jYXRpb24oKSksIEdyYXBoaWNzTGF5ZXI6OkRvbnRTZXROZWVk c0Rpc3BsYXkpOwogI2Vsc2UKICAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXRQ b3NpdGlvbigtc2Nyb2xsT2Zmc2V0KTsKIAogICAgICAgICBGbG9hdFNpemUgb2xkU2Nyb2xsaW5n TGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsKLSAg ICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKC10b0Zsb2F0U2l6 ZShwYWRkaW5nQm94LmxvY2F0aW9uKCkpKTsKKyAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0 T2Zmc2V0RnJvbVJlbmRlcmVyKC10b0Zsb2F0U2l6ZShwYWRkaW5nQm94SW5jbHVkaW5nU2Nyb2xs YmFyLmxvY2F0aW9uKCkpKTsKIAogICAgICAgICBpZiAobV9jaGlsZENsaXBwaW5nTWFza0xheWVy KSB7CiAgICAgICAgICAgICBtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldFBvc2l0aW9uKG1f c2Nyb2xsaW5nTGF5ZXItPnBvc2l0aW9uKCkpOwogICAgICAgICAgICAgbV9jaGlsZENsaXBwaW5n TWFza0xheWVyLT5zZXRTaXplKG1fc2Nyb2xsaW5nTGF5ZXItPnNpemUoKSk7Ci0gICAgICAgICAg ICBtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b0Zsb2F0 U2l6ZShwYWRkaW5nQm94LmxvY2F0aW9uKCkpKTsKKyAgICAgICAgICAgIG1fY2hpbGRDbGlwcGlu Z01hc2tMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRvRmxvYXRTaXplKHBhZGRpbmdCb3hJ bmNsdWRpbmdTY3JvbGxiYXIubG9jYXRpb24oKSkpOwogICAgICAgICB9CiAKICAgICAgICAgYm9v bCBwYWRkaW5nQm94T2Zmc2V0Q2hhbmdlZCA9IG9sZFNjcm9sbGluZ0xheWVyT2Zmc2V0ICE9IG1f c2Nyb2xsaW5nTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpOwpAQCAtMTIyOCw3ICsxMjI4LDcg QEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdlb21ldHJ5KCkKIAogICAgICAgICBt X3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldFNpemUoc2Nyb2xsU2l6ZSk7CiAgICAgICAgIG1f c2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0U2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCwgR3Jh cGhpY3NMYXllcjo6RG9udFNldE5lZWRzRGlzcGxheSk7Ci0gICAgICAgIG1fc2Nyb2xsaW5nQ29u dGVudHNMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRvTGF5b3V0U2l6ZShwYWRkaW5nQm94 LmxvY2F0aW9uKCkpLCBHcmFwaGljc0xheWVyOjpEb250U2V0TmVlZHNEaXNwbGF5KTsKKyAgICAg ICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9MYXlv dXRTaXplKHBhZGRpbmdCb3hJbmNsdWRpbmdTY3JvbGxiYXIubG9jYXRpb24oKSksIEdyYXBoaWNz TGF5ZXI6OkRvbnRTZXROZWVkc0Rpc3BsYXkpOwogI2VuZGlmCiAKICAgICAgICAgaWYgKG1fZm9y ZWdyb3VuZExheWVyKSB7Cg==