78169 2012-02-08 15:42:39 -0800 refactor RenderFlexibleBox to return preferred sizes of all children 2012-02-08 21:57:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony ojan webkit.review.bot oldest_to_newest 552563 0 tony 2012-02-08 15:42:39 -0800 refactor RenderFlexibleBox to return preferred sizes of all children 552566 1 126169 tony 2012-02-08 15:45:45 -0800 Created attachment 126169 Patch 552849 2 126169 webkit.review.bot 2012-02-08 21:57:29 -0800 Comment on attachment 126169 Patch Clearing flags on attachment: 126169 Committed r107179: <http://trac.webkit.org/changeset/107179> 552850 3 webkit.review.bot 2012-02-08 21:57:33 -0800 All reviewed patches have been landed. Closing bug. 126169 2012-02-08 15:45:45 -0800 2012-02-08 21:57:29 -0800 Patch bug-78169-20120208154634.patch text/plain 9803 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU0ZDE2OTRiMWM3NjY0 YzljZWUzYWYzYTA4ZjczOGMwNWQxMzM3ZS4uNTRhYTYxNWI1MjljYmE3MDY1ZWJmNWJhMjUyMDZh NzEwYjA0NTY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTA4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgcmVmYWN0b3IgUmVuZGVyRmxl eGlibGVCb3ggdG8gcmV0dXJuIHByZWZlcnJlZCBzaXplcyBvZiBhbGwgY2hpbGRyZW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTY5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVw YXJhdGlvbiBmb3IgbXVsdGktbGluZSBmbGV4Ym94LiBXZSBuZWVkIHRoZSBwcmVmZXJyZWQKKyAg ICAgICAgc2l6ZSBvZiBlYWNoIGNoaWxkIHNvIHdlIGNhbiBjb21wdXRlIHdoZXJlIHRoZSBtdWx0 aS1saW5lIGJyZWFrcyBoYXBwZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IHJlZmFj dG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwcmVmZXJyZWRNYWluQXhpc0NvbnRl bnRFeHRlbnRGb3JDaGlsZCk6IFJlbmFtZWQgZnJvbSBwcmVmZXJyZWRNYWluQXhpc0NvbnRlbnRF eHRlbnRGb3JGbGV4SXRlbSBiZWNhdXNlCisgICAgICAgIG90aGVyIG1ldGhvZHMgYXJlIEZvckNo aWxkIHJhdGhlciB0aGFuIEZvckZsZXhJdGVtLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OnJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG0pOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAgICAgICAoUmVuZGVy RmxleGlibGVCb3gpOgorCiAyMDEyLTAyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGFzc2VydGlvbiBpbiBzdmcvZG9tL1NWR1N0eWxlZEVs ZW1lbnQtcGVuZGluZ1Jlc291cmNlLWNyYXNoLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDYwMWQ4YTg5YTg0YjAxNGRkYzI3ZmM1 YTA0NzU3MTU5NzY4NjdjNWEuLmIwMjVjZDMxNzhmYWU3NDJjNWFkY2VmOWNkNThjYjViNmY3OGJj NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cApAQCAtNDUzLDcgKzQ1Myw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5B eGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkKICAgICByZXR1cm4g aXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQtPnZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKSA6IGNo aWxkLT5ob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVy RmxleGlibGVCb3g6OnByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckZsZXhJdGVtKFJl bmRlckJveCogY2hpbGQpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpwcmVm ZXJyZWRNYWluQXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKSBjb25z dAogewogICAgIExlbmd0aCBtYWluQXhpc0xlbmd0aCA9IG1haW5BeGlzTGVuZ3RoRm9yQ2hpbGQo Y2hpbGQpOwogICAgIGlmIChtYWluQXhpc0xlbmd0aC5pc0F1dG8oKSkgewpAQCAtNDY1LDEyICs0 NjUsMTUgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlZmVycmVkTWFpbkF4aXND b250ZW50RXh0ZW50Rm9yRmxleEl0ZW0oUmVuZGVyQm8KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJv eDo6bGF5b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKIHsKLSAgICBMYXlvdXRV bml0IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwogICAgIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4 aWJpbGl0eTsKICAgICBmbG9hdCB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHk7CiAgICAgVHJlZU9y ZGVySXRlcmF0b3IgdHJlZUl0ZXJhdG9yKHRoaXMpOwogCi0gICAgY29tcHV0ZVByZWZlcnJlZE1h aW5BeGlzRXh0ZW50KHJlbGF5b3V0Q2hpbGRyZW4sIHRyZWVJdGVyYXRvciwgcHJlZmVycmVkTWFp bkF4aXNFeHRlbnQsIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgdG90YWxOZWdhdGl2ZUZsZXhp YmlsaXR5KTsKKyAgICBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiBwcmVmZXJyZWRTaXplczsKKyAg ICBjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhyZWxheW91dENoaWxkcmVuLCB0cmVlSXRl cmF0b3IsIHByZWZlcnJlZFNpemVzLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVn YXRpdmVGbGV4aWJpbGl0eSk7CisgICAgTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluQXhpc0V4dGVu dCA9IDA7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwcmVmZXJyZWRTaXplcy5zaXplKCk7 ICsraSkKKyAgICAgICAgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQgKz0gcHJlZmVycmVkU2l6ZXNb aV07CiAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UgPSBtYWluQXhpc0NvbnRlbnRF eHRlbnQoKSAtIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50OwogCiAgICAgRmxleE9yZGVySXRlcmF0 b3IgZmxleEl0ZXJhdG9yKHRoaXMsIHRyZWVJdGVyYXRvci5mbGV4T3JkZXJWYWx1ZXMoKSk7CkBA IC01MDksMTUgKzUxMiwxNiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYXJnaW5C b3hBc2NlbnQoUmVuZGVyQm94KiBjaGlsZCkKICAgICByZXR1cm4gYXNjZW50ICsgZmxvd0F3YXJl TWFyZ2luQmVmb3JlRm9yQ2hpbGQoY2hpbGQpOwogfQogCi12b2lkIFJlbmRlckZsZXhpYmxlQm94 Ojpjb21wdXRlUHJlZmVycmVkTWFpbkF4aXNFeHRlbnQoYm9vbCByZWxheW91dENoaWxkcmVuLCBU cmVlT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIExheW91dFVuaXQmIHByZWZlcnJlZE1haW5BeGlz RXh0ZW50LCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxOZWdh dGl2ZUZsZXhpYmlsaXR5KQordm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlz UHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBUcmVlT3JkZXJJdGVyYXRvciYg aXRlcmF0b3IsIFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBwcmVmZXJyZWRTaXplcywgZmxvYXQm IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0 eSkKIHsKLSAgICBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCA9IDA7CiAgICAgdG90YWxQb3NpdGl2 ZUZsZXhpYmlsaXR5ID0gdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5ID0gMDsKIAogICAgIExheW91 dFVuaXQgZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhpc0NvbnRlbnRFeHRl bnQoKTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGls ZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKLSAgICAgICAgaWYgKGNoaWxkLT5pc1Bvc2l0 aW9uZWQoKSkKKyAgICAgICAgaWYgKGNoaWxkLT5pc1Bvc2l0aW9uZWQoKSkgeworICAgICAgICAg ICAgcHJlZmVycmVkU2l6ZXMuYXBwZW5kKDApOwogICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KIAogICAgICAgICBjaGlsZC0+Y2xlYXJPdmVycmlkZVNpemUoKTsKICAgICAgICAgaWYg KG1haW5BeGlzTGVuZ3RoRm9yQ2hpbGQoY2hpbGQpLmlzQXV0bygpKSB7CkBAIC01MjYsMjEgKzUz MCwyMiBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlUHJlZmVycmVkTWFpbkF4aXNF eHRlbnQoYm9vbCByZWxheW91dENoaWxkcmVuLCBUcgogICAgICAgICAgICAgY2hpbGQtPmxheW91 dElmTmVlZGVkKCk7CiAgICAgICAgIH0KIAorICAgICAgICBMYXlvdXRVbml0IHByZWZlcnJlZFNp emUgPSBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBwcmVm ZXJyZWRNYWluQXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZChjaGlsZCk7CisKICAgICAgICAgLy8g V2Ugc2V0IHRoZSBtYXJnaW5zIGJlY2F1c2Ugd2Ugd2FudCB0byBtYWtlIHN1cmUgJ2F1dG8nIGhh cyBhIG1hcmdpbgogICAgICAgICAvLyBvZiAwIGFuZCBiZWNhdXNlIGlmIHdlJ3JlIG5vdCBhdXRv IHNpemluZywgd2UgZG9uJ3QgZG8gYSBsYXlvdXQgdGhhdAogICAgICAgICAvLyBjb21wdXRlcyB0 aGUgc3RhcnQvZW5kIG1hcmdpbnMuCiAgICAgICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpIHsK ICAgICAgICAgICAgIGNoaWxkLT5zZXRNYXJnaW5MZWZ0KGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5M ZWZ0KCkuY2FsY01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KSk7CiAgICAg ICAgICAgICBjaGlsZC0+c2V0TWFyZ2luUmlnaHQoY2hpbGQtPnN0eWxlKCktPm1hcmdpblJpZ2h0 KCkuY2FsY01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KSk7Ci0gICAgICAg ICAgICBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCArPSBjaGlsZC0+bWFyZ2luTGVmdCgpICsgY2hp bGQtPm1hcmdpblJpZ2h0KCk7CisgICAgICAgICAgICBwcmVmZXJyZWRTaXplICs9IGNoaWxkLT5t YXJnaW5MZWZ0KCkgKyBjaGlsZC0+bWFyZ2luUmlnaHQoKTsKICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIGNoaWxkLT5zZXRNYXJnaW5Ub3AoY2hpbGQtPnN0eWxlKCktPm1hcmdpblRvcCgp LmNhbGNNaW5WYWx1ZShmbGV4Ym94QXZhaWxhYmxlQ29udGVudEV4dGVudCkpOwogICAgICAgICAg ICAgY2hpbGQtPnNldE1hcmdpbkJvdHRvbShjaGlsZC0+c3R5bGUoKS0+bWFyZ2luQm90dG9tKCku Y2FsY01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KSk7Ci0gICAgICAgICAg ICBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCArPSBjaGlsZC0+bWFyZ2luVG9wKCkgKyBjaGlsZC0+ bWFyZ2luQm90dG9tKCk7CisgICAgICAgICAgICBwcmVmZXJyZWRTaXplICs9IGNoaWxkLT5tYXJn aW5Ub3AoKSArIGNoaWxkLT5tYXJnaW5Cb3R0b20oKTsKICAgICAgICAgfQogCi0gICAgICAgIHBy ZWZlcnJlZE1haW5BeGlzRXh0ZW50ICs9IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZv ckNoaWxkKGNoaWxkKTsKLSAgICAgICAgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQgKz0gcHJlZmVy cmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yRmxleEl0ZW0oY2hpbGQpOworICAgICAgICBwcmVm ZXJyZWRTaXplcy5hcHBlbmQocHJlZmVycmVkU2l6ZSk7CiAKICAgICAgICAgdG90YWxQb3NpdGl2 ZUZsZXhpYmlsaXR5ICs9IHBvc2l0aXZlRmxleEZvckNoaWxkKGNoaWxkKTsKICAgICAgICAgdG90 YWxOZWdhdGl2ZUZsZXhpYmlsaXR5ICs9IG5lZ2F0aXZlRmxleEZvckNoaWxkKGNoaWxkKTsKQEAg LTU2MywxNCArNTY4LDE0IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJ1bkZyZWVTcGFjZUFs bG9jYXRpb25BbGdvcml0aG0oRmxleE9yZGVySXRlcmF0b3ImIGl0ZXJhCiAgICAgICAgIGlmIChp bmZsZXhpYmxlSXRlbXMuY29udGFpbnMoY2hpbGQpKQogICAgICAgICAgICAgY2hpbGRQcmVmZXJy ZWRTaXplID0gaW5mbGV4aWJsZUl0ZW1zLmdldChjaGlsZCk7CiAgICAgICAgIGVsc2UgewotICAg ICAgICAgICAgY2hpbGRQcmVmZXJyZWRTaXplID0gcHJlZmVycmVkTWFpbkF4aXNDb250ZW50RXh0 ZW50Rm9yRmxleEl0ZW0oY2hpbGQpOworICAgICAgICAgICAgY2hpbGRQcmVmZXJyZWRTaXplID0g cHJlZmVycmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQoY2hpbGQpOwogICAgICAgICAg ICAgaWYgKGF2YWlsYWJsZUZyZWVTcGFjZSA+IDAgJiYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5 ID4gMCkgewogICAgICAgICAgICAgICAgIGNoaWxkUHJlZmVycmVkU2l6ZSArPSBscm91bmRmKGF2 YWlsYWJsZUZyZWVTcGFjZSAqIHBvc2l0aXZlRmxleEZvckNoaWxkKGNoaWxkKSAvIHRvdGFsUG9z aXRpdmVGbGV4aWJpbGl0eSk7CiAKICAgICAgICAgICAgICAgICBMZW5ndGggY2hpbGRMb2dpY2Fs TWF4V2lkdGggPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC0+c3R5bGUoKS0+bWF4V2lkdGgo KSA6IGNoaWxkLT5zdHlsZSgpLT5tYXhIZWlnaHQoKTsKICAgICAgICAgICAgICAgICBpZiAoIWNo aWxkTG9naWNhbE1heFdpZHRoLmlzVW5kZWZpbmVkKCkgJiYgY2hpbGRMb2dpY2FsTWF4V2lkdGgu aXNTcGVjaWZpZWQoKSAmJiBjaGlsZFByZWZlcnJlZFNpemUgPiBjaGlsZExvZ2ljYWxNYXhXaWR0 aC5jYWxjVmFsdWUoZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQpKSB7CiAgICAgICAgICAg ICAgICAgICAgIGNoaWxkUHJlZmVycmVkU2l6ZSA9IGNoaWxkTG9naWNhbE1heFdpZHRoLmNhbGNW YWx1ZShmbGV4Ym94QXZhaWxhYmxlQ29udGVudEV4dGVudCk7Ci0gICAgICAgICAgICAgICAgICAg IGF2YWlsYWJsZUZyZWVTcGFjZSAtPSBjaGlsZFByZWZlcnJlZFNpemUgLSBwcmVmZXJyZWRNYWlu QXhpc0NvbnRlbnRFeHRlbnRGb3JGbGV4SXRlbShjaGlsZCk7CisgICAgICAgICAgICAgICAgICAg IGF2YWlsYWJsZUZyZWVTcGFjZSAtPSBjaGlsZFByZWZlcnJlZFNpemUgLSBwcmVmZXJyZWRNYWlu QXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZChjaGlsZCk7CiAgICAgICAgICAgICAgICAgICAgIHRv dGFsUG9zaXRpdmVGbGV4aWJpbGl0eSAtPSBwb3NpdGl2ZUZsZXhGb3JDaGlsZChjaGlsZCk7CiAK ICAgICAgICAgICAgICAgICAgICAgaW5mbGV4aWJsZUl0ZW1zLnNldChjaGlsZCwgY2hpbGRQcmVm ZXJyZWRTaXplKTsKQEAgLTU4Miw3ICs1ODcsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpy dW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtKEZsZXhPcmRlckl0ZXJhdG9yJiBpdGVyYQog ICAgICAgICAgICAgICAgIExlbmd0aCBjaGlsZExvZ2ljYWxNaW5XaWR0aCA9IGlzSG9yaXpvbnRh bEZsb3coKSA/IGNoaWxkLT5zdHlsZSgpLT5taW5XaWR0aCgpIDogY2hpbGQtPnN0eWxlKCktPm1p bkhlaWdodCgpOwogICAgICAgICAgICAgICAgIGlmICghY2hpbGRMb2dpY2FsTWluV2lkdGguaXNV bmRlZmluZWQoKSAmJiBjaGlsZExvZ2ljYWxNaW5XaWR0aC5pc1NwZWNpZmllZCgpICYmIGNoaWxk UHJlZmVycmVkU2l6ZSA8IGNoaWxkTG9naWNhbE1pbldpZHRoLmNhbGNWYWx1ZShmbGV4Ym94QXZh aWxhYmxlQ29udGVudEV4dGVudCkpIHsKICAgICAgICAgICAgICAgICAgICAgY2hpbGRQcmVmZXJy ZWRTaXplID0gY2hpbGRMb2dpY2FsTWluV2lkdGguY2FsY1ZhbHVlKGZsZXhib3hBdmFpbGFibGVD b250ZW50RXh0ZW50KTsKLSAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlRnJlZVNwYWNlICs9 IHByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckZsZXhJdGVtKGNoaWxkKSAtIGNoaWxk UHJlZmVycmVkU2l6ZTsKKyAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlRnJlZVNwYWNlICs9 IHByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNoaWxkKGNoaWxkKSAtIGNoaWxkUHJl ZmVycmVkU2l6ZTsKICAgICAgICAgICAgICAgICAgICAgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5 IC09IG5lZ2F0aXZlRmxleEZvckNoaWxkKGNoaWxkKTsKIAogICAgICAgICAgICAgICAgICAgICBp bmZsZXhpYmxlSXRlbXMuc2V0KGNoaWxkLCBjaGlsZFByZWZlcnJlZFNpemUpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCAzZWM0YzJhNmI4ODk2 NjlmOGE1YzhmZWVhZThkNWJhZWE4OTg4ZmE4Li4wODMzMjE3YjY4NDk2NGUxODNmMjIxNGZiNjQ2 MzVmNjJmMzcxOGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guaApAQCAtODUsNyArODUsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRqdXN0QWxpZ25t ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCk7CiAgICAgTGF5b3V0VW5p dCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxk KSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1haW5BeGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQo UmVuZGVyQm94KiBjaGlsZCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluQXhp c0NvbnRlbnRFeHRlbnRGb3JGbGV4SXRlbShSZW5kZXJCb3gqIGNoaWxkKSBjb25zdDsKKyAgICBM YXlvdXRVbml0IHByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNoaWxkKFJlbmRlckJv eCogY2hpbGQpIGNvbnN0OwogCiAgICAgdm9pZCBsYXlvdXRGbGV4SXRlbXMoYm9vbCByZWxheW91 dENoaWxkcmVuKTsKIApAQCAtOTUsNyArOTUsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQg YXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JDaGlsZChSZW5kZXJCb3gqKTsKICAgICBMYXlvdXRV bml0IG1hcmdpbkJveEFzY2VudChSZW5kZXJCb3gqKTsKIAotICAgIHZvaWQgY29tcHV0ZVByZWZl cnJlZE1haW5BeGlzRXh0ZW50KGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgVHJlZU9yZGVySXRlcmF0 b3ImLCBMYXlvdXRVbml0JiwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQm IHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7CisgICAgdm9pZCBjb21wdXRlTWFpbkF4aXNQcmVm ZXJyZWRTaXplcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFRyZWVPcmRlckl0ZXJhdG9yJiwgV1RG OjpWZWN0b3I8TGF5b3V0VW5pdD4mLCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBm bG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5KTsKICAgICBib29sIHJ1bkZyZWVTcGFjZUFs bG9jYXRpb25BbGdvcml0aG0oRmxleE9yZGVySXRlcmF0b3ImLCBMYXlvdXRVbml0JiBhdmFpbGFi bGVGcmVlU3BhY2UsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIGZsb2F0JiB0b3Rh bE5lZ2F0aXZlRmxleGliaWxpdHksIEluZmxleGlibGVGbGV4SXRlbVNpemUmLCBXVEY6OlZlY3Rv cjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcyk7CiAgICAgdm9pZCBzZXRMb2dpY2FsT3ZlcnJpZGVT aXplKFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgY2hpbGRQcmVmZXJyZWRTaXplKTsKICAg ICB2b2lkIHByZXBhcmVDaGlsZEZvclBvc2l0aW9uZWRMYXlvdXQoUmVuZGVyQm94KiBjaGlsZCwg TGF5b3V0VW5pdCBtYWluQXhpc09mZnNldCwgTGF5b3V0VW5pdCBjcm9zc0F4aXNPZmZzZXQpOwo=