78281 2012-02-09 14:10:58 -0800 more refactoring of RenderFlexibleBox in preparation for multiline 2012-02-09 16:42:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony hyatt ojan oldest_to_newest 553489 0 tony 2012-02-09 14:10:58 -0800 more refactoring of RenderFlexibleBox in preparation for multiline 553503 1 126372 tony 2012-02-09 14:24:14 -0800 Created attachment 126372 Patch 553617 2 tony 2012-02-09 16:42:58 -0800 Committed r107310: <http://trac.webkit.org/changeset/107310> 126372 2012-02-09 14:24:14 -0800 2012-02-09 16:41:15 -0800 Patch bug-78281-20120209142504.patch text/plain 15694 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI3MTQxYjA3Y2M2YmQ2 ZmFmYzMwMWU4MWNiMzUwOWFlZmU4OGVkOC4uMzAxNDU5ZWUzM2Y0NzNiNDRjYmVhZWM3ZmJkZDky ODQzMmY0NzdlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTA5ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbW9yZSByZWZhY3RvcmluZyBv ZiBSZW5kZXJGbGV4aWJsZUJveCBpbiBwcmVwYXJhdGlvbiBmb3IgbXVsdGlsaW5lCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODI4MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIHdlIHdl cmUgY3JlYXRpbmcgVmVjdG9yIG9mIGVhY2ggZmxleCBpdGVtJ3MgcHJlZmVycmVkIHNpemUgaW4g ZG9jdW1lbnQgb3JkZXIsCisgICAgICAgIGJ1dCBmb3IgbXVsdGlsaW5lLCB3ZSBuZWVkIHRvIGJy ZWFrIHRoZSBsaW5lcyBpbiB0aGUgZmxleCBvcmRlci4gIEkganVzdCByZW1vdmVkIHRoaXMgY29k ZQorICAgICAgICBzaW5jZSBpdCB3YXMgdGhlIHdyb25nIG9yZGVyLgorCisgICAgICAgIEluc3Rl YWQsIGhhdmUgMiBmdW50aW9ucywgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMgd2hpY2gg b25seSBkb2VzIHRoZSBuZWNlc3NhcnkKKyAgICAgICAgbGF5b3V0cyBhbmQgbWFyZ2luIGNvbXB1 dGF0aW9ucyB0byBjb21wdXRlIHByZWZlcnJlZCBzaXplcyBhbmQgY29tcHV0ZUZsZXhPcmRlciB3 aGljaAorICAgICAgICBkb2VzIHRoZSB3b3JrIG9mIGNvbXB1dGluZyB0aGUgZmxleCBvcmRlciwg cHJlZmVycmVkIHNpemVzLCBwb3NpdGl2ZS9uZWdhdGl2ZSBmbGV4LgorCisgICAgICAgIEZvciBt dWx0aWxpbmUsIHdlIHdpbGwgaGF2ZSBjb21wdXRlRmxleE9yZGVyIGRyaXZlIGEgd2hpbGUgbG9v cCBhbmQgaXQgd2lsbCByZXR1cm4gdGhlCisgICAgICAgIGZsZXggaXRlbXMsIHByZWZlcnJlZCBz aXplLCBhbmQgcG9zaXRpdmUvbmVnYXRpdmUgZmxleCB2YWx1ZXMgZm9yIGVhY2ggbGluZS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGp1c3QgcmVmYWN0b3JpbmcuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4 aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMpOiBPbmx5IGxheW91dCBhdXRv IHNpemVkIGNoaWxkcmVuIGFuZCBzZXQgbWFyZ2lucy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleE9yZGVyKTogQ29tcHV0ZSBmbGV4IG9yZGVyLCBwcmVm ZXJyZWQgc2l6ZSwgcG9zaXRpdmUvbmVnYXRpdmUgZmxleC4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94OjpydW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtKTogVXNlIHRo ZSBwcmVjb21wdXRlZCBmbGV4IG9yZGVyLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4pOiBVc2UgdGhlIHByZWNvbXB1dGVkIGZsZXgg b3JkZXIuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0Q29sdW1u UmV2ZXJzZSk6IFVzZSB0aGUgcHJlY29tcHV0ZWQgZmxleCBvcmRlci4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxkcmVuKTogVXNlIHRoZSBwcmVjb21wdXRl ZCBmbGV4IG9yZGVyLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgor ICAgICAgICAoUmVuZGVyRmxleGlibGVCb3gpOgorCiAyMDEyLTAyLTA5ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTA3MDM1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHAKaW5kZXggYjAyNWNkMzE3OGZhZTc0MmM1YWRjZWY5Y2Q1OGNiNWI2Zjc4YmM2 Mi4uYmZlMWRiMDE1YmVjNjUzYzM1NDM3NzQxNWQxNGUyOTQzZGEwN2FkOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC00NjUsMjYgKzQ2 NSwyNSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpwcmVmZXJyZWRNYWluQXhpc0Nv bnRlbnRFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gqCiAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6 OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiB7CisgICAgVHJlZU9yZGVy SXRlcmF0b3IgdHJlZUl0ZXJhdG9yKHRoaXMpOworICAgIGNvbXB1dGVNYWluQXhpc1ByZWZlcnJl ZFNpemVzKHJlbGF5b3V0Q2hpbGRyZW4sIHRyZWVJdGVyYXRvcik7CisKKyAgICBPcmRlcmVkRmxl eEl0ZW1MaXN0IG9yZGVyZWRDaGlsZHJlbjsKKyAgICBMYXlvdXRVbml0IHByZWZlcnJlZE1haW5B eGlzRXh0ZW50OwogICAgIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eTsKICAgICBmbG9h dCB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHk7Ci0gICAgVHJlZU9yZGVySXRlcmF0b3IgdHJlZUl0 ZXJhdG9yKHRoaXMpOworICAgIEZsZXhPcmRlckl0ZXJhdG9yIGZsZXhJdGVyYXRvcih0aGlzLCB0 cmVlSXRlcmF0b3IuZmxleE9yZGVyVmFsdWVzKCkpOworICAgIGNvbXB1dGVGbGV4T3JkZXIoZmxl eEl0ZXJhdG9yLCBvcmRlcmVkQ2hpbGRyZW4sIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50LCB0b3Rh bFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSk7CiAKLSAgICBX VEY6OlZlY3RvcjxMYXlvdXRVbml0PiBwcmVmZXJyZWRTaXplczsKLSAgICBjb21wdXRlTWFpbkF4 aXNQcmVmZXJyZWRTaXplcyhyZWxheW91dENoaWxkcmVuLCB0cmVlSXRlcmF0b3IsIHByZWZlcnJl ZFNpemVzLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0 eSk7Ci0gICAgTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCA9IDA7Ci0gICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBwcmVmZXJyZWRTaXplcy5zaXplKCk7ICsraSkKLSAgICAgICAg cHJlZmVycmVkTWFpbkF4aXNFeHRlbnQgKz0gcHJlZmVycmVkU2l6ZXNbaV07CiAgICAgTGF5b3V0 VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKSAtIHByZWZl cnJlZE1haW5BeGlzRXh0ZW50OwotCi0gICAgRmxleE9yZGVySXRlcmF0b3IgZmxleEl0ZXJhdG9y KHRoaXMsIHRyZWVJdGVyYXRvci5mbGV4T3JkZXJWYWx1ZXMoKSk7CiAgICAgSW5mbGV4aWJsZUZs ZXhJdGVtU2l6ZSBpbmZsZXhpYmxlSXRlbXM7CiAgICAgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4g Y2hpbGRTaXplczsKLSAgICB3aGlsZSAoIXJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG0o ZmxleEl0ZXJhdG9yLCBhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0 eSwgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5LCBpbmZsZXhpYmxlSXRlbXMsIGNoaWxkU2l6ZXMp KSB7CisgICAgd2hpbGUgKCFydW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtKG9yZGVyZWRD aGlsZHJlbiwgYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRv dGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwgaW5mbGV4aWJsZUl0ZW1zLCBjaGlsZFNpemVzKSkgewog ICAgICAgICBBU1NFUlQodG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5ID49IDAgJiYgdG90YWxOZWdh dGl2ZUZsZXhpYmlsaXR5ID49IDApOwogICAgICAgICBBU1NFUlQoaW5mbGV4aWJsZUl0ZW1zLnNp emUoKSA+IDApOwogICAgIH0KIAotICAgIGxheW91dEFuZFBsYWNlQ2hpbGRyZW4oZmxleEl0ZXJh dG9yLCBjaGlsZFNpemVzLCBhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVGbGV4aWJp bGl0eSk7CisgICAgbGF5b3V0QW5kUGxhY2VDaGlsZHJlbihvcmRlcmVkQ2hpbGRyZW4sIGNoaWxk U2l6ZXMsIGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5KTsKIH0K IAogZmxvYXQgUmVuZGVyRmxleGlibGVCb3g6OnBvc2l0aXZlRmxleEZvckNoaWxkKFJlbmRlckJv eCogY2hpbGQpIGNvbnN0CkBAIC01MTIsMTYgKzUxMSwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckZs ZXhpYmxlQm94OjptYXJnaW5Cb3hBc2NlbnQoUmVuZGVyQm94KiBjaGlsZCkKICAgICByZXR1cm4g YXNjZW50ICsgZmxvd0F3YXJlTWFyZ2luQmVmb3JlRm9yQ2hpbGQoY2hpbGQpOwogfQogCi12b2lk IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhib29sIHJl bGF5b3V0Q2hpbGRyZW4sIFRyZWVPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgV1RGOjpWZWN0b3I8 TGF5b3V0VW5pdD4mIHByZWZlcnJlZFNpemVzLCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmls aXR5LCBmbG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5KQordm9pZCBSZW5kZXJGbGV4aWJs ZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVu LCBUcmVlT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IpCiB7Ci0gICAgdG90YWxQb3NpdGl2ZUZsZXhp YmlsaXR5ID0gdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5ID0gMDsKLQogICAgIExheW91dFVuaXQg ZmxleGJveEF2YWlsYWJsZUNvbnRlbnRFeHRlbnQgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKTsK ICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGlsZDsgY2hp bGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKLSAgICAgICAgaWYgKGNoaWxkLT5pc1Bvc2l0aW9uZWQo KSkgewotICAgICAgICAgICAgcHJlZmVycmVkU2l6ZXMuYXBwZW5kKDApOworICAgICAgICBpZiAo Y2hpbGQtPmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0K IAogICAgICAgICBjaGlsZC0+Y2xlYXJPdmVycmlkZVNpemUoKTsKICAgICAgICAgaWYgKG1haW5B eGlzTGVuZ3RoRm9yQ2hpbGQoY2hpbGQpLmlzQXV0bygpKSB7CkBAIC01MzAsMzUgKzUyNSw1MSBA QCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNQcmVmZXJyZWRTaXplcyhi b29sIHJlbGF5b3V0Q2hpbGRyZW4sIFRyZQogICAgICAgICAgICAgY2hpbGQtPmxheW91dElmTmVl ZGVkKCk7CiAgICAgICAgIH0KIAotICAgICAgICBMYXlvdXRVbml0IHByZWZlcnJlZFNpemUgPSBt YWluQXhpc0JvcmRlckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBwcmVmZXJyZWRN YWluQXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZChjaGlsZCk7Ci0KICAgICAgICAgLy8gV2Ugc2V0 IHRoZSBtYXJnaW5zIGJlY2F1c2Ugd2Ugd2FudCB0byBtYWtlIHN1cmUgJ2F1dG8nIGhhcyBhIG1h cmdpbgogICAgICAgICAvLyBvZiAwIGFuZCBiZWNhdXNlIGlmIHdlJ3JlIG5vdCBhdXRvIHNpemlu Zywgd2UgZG9uJ3QgZG8gYSBsYXlvdXQgdGhhdAogICAgICAgICAvLyBjb21wdXRlcyB0aGUgc3Rh cnQvZW5kIG1hcmdpbnMuCiAgICAgICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpIHsKICAgICAg ICAgICAgIGNoaWxkLT5zZXRNYXJnaW5MZWZ0KGNoaWxkLT5zdHlsZSgpLT5tYXJnaW5MZWZ0KCku Y2FsY01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KSk7CiAgICAgICAgICAg ICBjaGlsZC0+c2V0TWFyZ2luUmlnaHQoY2hpbGQtPnN0eWxlKCktPm1hcmdpblJpZ2h0KCkuY2Fs Y01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250ZW50RXh0ZW50KSk7Ci0gICAgICAgICAgICBw cmVmZXJyZWRTaXplICs9IGNoaWxkLT5tYXJnaW5MZWZ0KCkgKyBjaGlsZC0+bWFyZ2luUmlnaHQo KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGNoaWxkLT5zZXRNYXJnaW5Ub3AoY2hp bGQtPnN0eWxlKCktPm1hcmdpblRvcCgpLmNhbGNNaW5WYWx1ZShmbGV4Ym94QXZhaWxhYmxlQ29u dGVudEV4dGVudCkpOwogICAgICAgICAgICAgY2hpbGQtPnNldE1hcmdpbkJvdHRvbShjaGlsZC0+ c3R5bGUoKS0+bWFyZ2luQm90dG9tKCkuY2FsY01pblZhbHVlKGZsZXhib3hBdmFpbGFibGVDb250 ZW50RXh0ZW50KSk7Ci0gICAgICAgICAgICBwcmVmZXJyZWRTaXplICs9IGNoaWxkLT5tYXJnaW5U b3AoKSArIGNoaWxkLT5tYXJnaW5Cb3R0b20oKTsKICAgICAgICAgfQorICAgIH0KK30KKwordm9p ZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhPcmRlcihGbGV4T3JkZXJJdGVyYXRvciYg aXRlcmF0b3IsIE9yZGVyZWRGbGV4SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbiwgTGF5b3V0VW5p dCYgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGliaWxp dHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHkpCit7CisgICAgb3JkZXJlZENoaWxk cmVuLmNsZWFyKCk7CisgICAgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQgPSAwOworICAgIHRvdGFs UG9zaXRpdmVGbGV4aWJpbGl0eSA9IHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSA9IDA7CisgICAg Zm9yIChSZW5kZXJCb3gqIGNoaWxkID0gaXRlcmF0b3IuZmlyc3QoKTsgY2hpbGQ7IGNoaWxkID0g aXRlcmF0b3IubmV4dCgpKSB7CisgICAgICAgIG9yZGVyZWRDaGlsZHJlbi5hcHBlbmQoY2hpbGQp OworICAgICAgICBpZiAoY2hpbGQtPmlzUG9zaXRpb25lZCgpKQorICAgICAgICAgICAgY29udGlu dWU7CiAKLSAgICAgICAgcHJlZmVycmVkU2l6ZXMuYXBwZW5kKHByZWZlcnJlZFNpemUpOworICAg ICAgICBMYXlvdXRVbml0IGNoaWxkTWFpbkF4aXNFeHRlbnQgPSBtYWluQXhpc0JvcmRlckFuZFBh ZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBwcmVmZXJyZWRNYWluQXhpc0NvbnRlbnRFeHRl bnRGb3JDaGlsZChjaGlsZCk7CisgICAgICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCisgICAg ICAgICAgICBjaGlsZE1haW5BeGlzRXh0ZW50ICs9IGNoaWxkLT5tYXJnaW5MZWZ0KCkgKyBjaGls ZC0+bWFyZ2luUmlnaHQoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY2hpbGRNYWluQXhp c0V4dGVudCArPSBjaGlsZC0+bWFyZ2luVG9wKCkgKyBjaGlsZC0+bWFyZ2luQm90dG9tKCk7CiAK KyAgICAgICAgLy8gRklYTUU6IFdoZW4gaW1wbGVtZW50aW5nIG11bHRpbGluZSwgd2Ugd291bGQg cmV0dXJuIGhlcmUgaWYgYWRkaW5nCisgICAgICAgIC8vIHRoZSBjaGlsZCdzIG1haW4gYXhpcyBl eHRlbnQgd291bGQgY2F1c2UgdXMgdG8gb3ZlcmZsb3cuCisgICAgICAgIHByZWZlcnJlZE1haW5B eGlzRXh0ZW50ICs9IGNoaWxkTWFpbkF4aXNFeHRlbnQ7CiAgICAgICAgIHRvdGFsUG9zaXRpdmVG bGV4aWJpbGl0eSArPSBwb3NpdGl2ZUZsZXhGb3JDaGlsZChjaGlsZCk7CiAgICAgICAgIHRvdGFs TmVnYXRpdmVGbGV4aWJpbGl0eSArPSBuZWdhdGl2ZUZsZXhGb3JDaGlsZChjaGlsZCk7CiAgICAg fQogfQogCiAvLyBSZXR1cm5zIHRydWUgaWYgd2Ugc3VjY2Vzc2Z1bGx5IHJhbiB0aGUgYWxnb3Jp dGhtIGFuZCBzaXplZCB0aGUgZmxleCBpdGVtcy4KLWJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJ1 bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG0oRmxleE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9y LCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxl eGliaWxpdHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHksIEluZmxleGlibGVGbGV4 SXRlbVNpemUmIGluZmxleGlibGVJdGVtcywgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxk U2l6ZXMpCitib29sIFJlbmRlckZsZXhpYmxlQm94OjpydW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxn b3JpdGhtKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBMYXlvdXRVbml0JiBh dmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIGZsb2F0 JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHksIEluZmxleGlibGVGbGV4SXRlbVNpemUmIGluZmxl eGlibGVJdGVtcywgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMpCiB7CiAgICAg Y2hpbGRTaXplcy5jbGVhcigpOwogCiAgICAgTGF5b3V0VW5pdCBmbGV4Ym94QXZhaWxhYmxlQ29u dGVudEV4dGVudCA9IG1haW5BeGlzQ29udGVudEV4dGVudCgpOwotICAgIGZvciAoUmVuZGVyQm94 KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQo KSkgeworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgUmVuZGVyQm94KiBjaGlsZCA9IGNoaWxkcmVuW2ldOwogICAgICAgICBpZiAoY2hp bGQtPmlzUG9zaXRpb25lZCgpKSB7CiAgICAgICAgICAgICBjaGlsZFNpemVzLmFwcGVuZCgwKTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtNjY0LDcgKzY3NSw3IEBAIHN0YXRpYyBFRmxleEFs aWduIGZsZXhBbGlnbkZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpCiAgICAgcmV0dXJuIGFsaWdu OwogfQogCi12b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKEZs ZXhPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4m IGNoaWxkU2l6ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCB0b3RhbFBv c2l0aXZlRmxleGliaWxpdHkpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFj ZUNoaWxkcmVuKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBjb25zdCBXVEY6 OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVl U3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSkKIHsKICAgICBMYXlvdXRVbml0 IG1haW5BeGlzT2Zmc2V0ID0gZmxvd0F3YXJlQm9yZGVyU3RhcnQoKSArIGZsb3dBd2FyZVBhZGRp bmdTdGFydCgpOwogICAgIG1haW5BeGlzT2Zmc2V0ICs9IGluaXRpYWxQYWNraW5nT2Zmc2V0KGF2 YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBzdHlsZSgpLT5mbGV4 UGFjaygpLCBjaGlsZFNpemVzLnNpemUoKSk7CkBAIC02NzUsOCArNjg2LDggQEAgdm9pZCBSZW5k ZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VDaGlsZHJlbihGbGV4T3JkZXJJdGVyYXRvciYg aXRlcmF0b3IsIGNvbnMKICAgICBMYXlvdXRVbml0IHRvdGFsTWFpbkV4dGVudCA9IG1haW5BeGlz RXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXhBc2NlbnQgPSAwLCBtYXhEZXNjZW50ID0gMDsg Ly8gVXNlZCB3aGVuIGZsZXgtYWxpZ246IGJhc2VsaW5lLgogICAgIGJvb2wgc2hvdWxkRmxpcE1h aW5BeGlzID0gIWlzQ29sdW1uRmxvdygpICYmICFpc0xlZnRUb1JpZ2h0RmxvdygpOwotICAgIHNp emVfdCBpID0gMDsKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgp OyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCksICsraSkgeworICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgUmVuZGVyQm94KiBj aGlsZCA9IGNoaWxkcmVuW2ldOwogICAgICAgICBpZiAoY2hpbGQtPmlzUG9zaXRpb25lZCgpKSB7 CiAgICAgICAgICAgICBwcmVwYXJlQ2hpbGRGb3JQb3NpdGlvbmVkTGF5b3V0KGNoaWxkLCBtYWlu QXhpc09mZnNldCwgY3Jvc3NBeGlzT2Zmc2V0KTsKICAgICAgICAgICAgIG1haW5BeGlzT2Zmc2V0 ICs9IHBhY2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFs UG9zaXRpdmVGbGV4aWJpbGl0eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5zaXpl KCkpOwpAQCAtNzE5LDEzICs3MzAsMTMgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0 QW5kUGxhY2VDaGlsZHJlbihGbGV4T3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIGNvbnMKICAgICAg ICAgLy8gV2UgaGF2ZSB0byBkbyBhbiBleHRyYSBwYXNzIGZvciBjb2x1bW4tcmV2ZXJzZSB0byBy ZXBvc2l0aW9uIHRoZSBmbGV4IGl0ZW1zIHNpbmNlIHRoZSBzdGFydCBkZXBlbmRzCiAgICAgICAg IC8vIG9uIHRoZSBoZWlnaHQgb2YgdGhlIGZsZXhib3gsIHdoaWNoIHdlIG9ubHkga25vdyBhZnRl ciB3ZSd2ZSBwb3NpdGlvbmVkIGFsbCB0aGUgZmxleCBpdGVtcy4KICAgICAgICAgY29tcHV0ZUxv Z2ljYWxIZWlnaHQoKTsKLSAgICAgICAgbGF5b3V0Q29sdW1uUmV2ZXJzZShpdGVyYXRvciwgY2hp bGRTaXplcywgYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHkpOwor ICAgICAgICBsYXlvdXRDb2x1bW5SZXZlcnNlKGNoaWxkcmVuLCBjaGlsZFNpemVzLCBhdmFpbGFi bGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSk7CiAgICAgfQogCi0gICAgYWxp Z25DaGlsZHJlbihpdGVyYXRvciwgbWF4QXNjZW50KTsKKyAgICBhbGlnbkNoaWxkcmVuKGNoaWxk cmVuLCBtYXhBc2NlbnQpOwogfQogCi12b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRDb2x1 bW5SZXZlcnNlKEZsZXhPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgV1RGOjpWZWN0b3I8 TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBm bG9hdCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHkpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojps YXlvdXRDb2x1bW5SZXZlcnNlKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBj b25zdCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFp bGFibGVGcmVlU3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSkKIHsKICAgICAv LyBUaGlzIGlzIHNpbWlsYXIgdG8gdGhlIGxvZ2ljIGluIGxheW91dEFuZFBsYWNlQ2hpbGRyZW4s IGV4Y2VwdCB3ZSBwbGFjZSB0aGUgY2hpbGRyZW4KICAgICAvLyBzdGFydGluZyBmcm9tIHRoZSBl bmQgb2YgdGhlIGZsZXhib3guIFdlIGFsc28gZG9uJ3QgbmVlZCB0byBsYXlvdXQgYW55dGhpbmcg c2luY2Ugd2UncmUKQEAgLTczNSw4ICs3NDYsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojps YXlvdXRDb2x1bW5SZXZlcnNlKEZsZXhPcmRlckl0ZXJhdG9yJiBpdGVyYXRvciwgY29uc3QgVwog ICAgIG1haW5BeGlzT2Zmc2V0IC09IGlzSG9yaXpvbnRhbEZsb3coKSA/IHZlcnRpY2FsU2Nyb2xs YmFyV2lkdGgoKSA6IGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoKTsKIAogICAgIExheW91dFVu aXQgY3Jvc3NBeGlzT2Zmc2V0ID0gZmxvd0F3YXJlQm9yZGVyQmVmb3JlKCkgKyBmbG93QXdhcmVQ YWRkaW5nQmVmb3JlKCk7Ci0gICAgc2l6ZV90IGkgPSAwOwotICAgIGZvciAoUmVuZGVyQm94KiBj aGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSwg KytpKSB7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbi5zaXplKCk7ICsraSkg eworICAgICAgICBSZW5kZXJCb3gqIGNoaWxkID0gY2hpbGRyZW5baV07CiAgICAgICAgIGlmIChj aGlsZC0+aXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgICAgIGNoaWxkLT5sYXllcigpLT5zZXRT dGF0aWNCbG9ja1Bvc2l0aW9uKG1haW5BeGlzT2Zmc2V0KTsKICAgICAgICAgICAgIG1haW5BeGlz T2Zmc2V0IC09IHBhY2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2Us IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXpl cy5zaXplKCkpOwpAQCAtNzY3LDExICs3NzgsMTIgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6 YWRqdXN0QWxpZ25tZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBkZWwK ICAgICAgICAgY2hpbGQtPnJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKG9sZFJlY3QpOwogfQog Ci12b2lkIFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxkcmVuKEZsZXhPcmRlckl0ZXJhdG9y JiBpdGVyYXRvciwgTGF5b3V0VW5pdCBtYXhBc2NlbnQpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94 OjphbGlnbkNoaWxkcmVuKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBMYXlv dXRVbml0IG1heEFzY2VudCkKIHsKICAgICBMYXlvdXRVbml0IGNyb3NzRXh0ZW50ID0gY3Jvc3NB eGlzRXh0ZW50KCk7CiAKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJz dCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKKyAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IGNoaWxkcmVuLnNpemUoKTsgKytpKSB7CisgICAgICAgIFJlbmRlckJveCogY2hp bGQgPSBjaGlsZHJlbltpXTsKICAgICAgICAgLy8gZGlyZWN0aW9uOnJ0bCArIGZsZXgtZGlyZWN0 aW9uOmNvbHVtbiBtZWFucyB0aGUgY3Jvc3MtYXhpcyBkaXJlY3Rpb24gaXMgZmxpcHBlZC4KICAg ICAgICAgaWYgKCFzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgJiYgaXNDb2x1bW5G bG93KCkpIHsKICAgICAgICAgICAgIExheW91dFBvaW50IGxvY2F0aW9uID0gZmxvd0F3YXJlTG9j YXRpb25Gb3JDaGlsZChjaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oCmluZGV4IDA4MzMyMTdiNjg0OTY0ZTE4M2YyMjE0ZmI2NDYzNWY2MmYzNzE4 YTQuLjcyZGJkY2IwZTA4ZTc2NDdhN2I2ZGU2NGVlZWVjMGQ0YWRkNjhjNWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC01Miw2ICs1Miw3IEBA IHByaXZhdGU6CiAgICAgY2xhc3MgVHJlZU9yZGVySXRlcmF0b3I7CiAgICAgY2xhc3MgRmxleE9y ZGVySXRlcmF0b3I7CiAgICAgdHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgUmVuZGVyQm94Kiwg TGF5b3V0VW5pdD4gSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZTsKKyAgICB0eXBlZGVmIFdURjo6VmVj dG9yPFJlbmRlckJveCo+IE9yZGVyZWRGbGV4SXRlbUxpc3Q7CiAKICAgICBib29sIGhhc09ydGhv Z29uYWxGbG93KFJlbmRlckJveCogY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgaXNDb2x1bW5GbG93 KCkgY29uc3Q7CkBAIC05NSwxMyArOTYsMTQgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGF2 YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQoUmVuZGVyQm94Kik7CiAgICAgTGF5b3V0VW5p dCBtYXJnaW5Cb3hBc2NlbnQoUmVuZGVyQm94Kik7CiAKLSAgICB2b2lkIGNvbXB1dGVNYWluQXhp c1ByZWZlcnJlZFNpemVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgVHJlZU9yZGVySXRlcmF0b3Im LCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGliaWxp dHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHkpOwotICAgIGJvb2wgcnVuRnJlZVNw YWNlQWxsb2NhdGlvbkFsZ29yaXRobShGbGV4T3JkZXJJdGVyYXRvciYsIExheW91dFVuaXQmIGF2 YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQm IHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYsIFdURjo6 VmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNpemVzKTsKKyAgICB2b2lkIGNvbXB1dGVNYWluQXhp c1ByZWZlcnJlZFNpemVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgVHJlZU9yZGVySXRlcmF0b3Im KTsKKyAgICB2b2lkIGNvbXB1dGVGbGV4T3JkZXIoRmxleE9yZGVySXRlcmF0b3ImLCBPcmRlcmVk RmxleEl0ZW1MaXN0JiBvcmRlcmVkQ2hpbGRyZW4sIExheW91dFVuaXQmIHByZWZlcnJlZE1haW5B eGlzRXh0ZW50LCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxO ZWdhdGl2ZUZsZXhpYmlsaXR5KTsKKyAgICBib29sIHJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdv cml0aG0oY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIExheW91dFVuaXQmIGF2YWlsYWJsZUZy ZWVTcGFjZSwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVn YXRpdmVGbGV4aWJpbGl0eSwgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYsIFdURjo6VmVjdG9yPExh eW91dFVuaXQ+JiBjaGlsZFNpemVzKTsKICAgICB2b2lkIHNldExvZ2ljYWxPdmVycmlkZVNpemUo UmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZFByZWZlcnJlZFNpemUpOwogICAgIHZv aWQgcHJlcGFyZUNoaWxkRm9yUG9zaXRpb25lZExheW91dChSZW5kZXJCb3gqIGNoaWxkLCBMYXlv dXRVbml0IG1haW5BeGlzT2Zmc2V0LCBMYXlvdXRVbml0IGNyb3NzQXhpc09mZnNldCk7Ci0gICAg dm9pZCBsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKEZsZXhPcmRlckl0ZXJhdG9yJiwgY29uc3QgV1RG OjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJl ZVNwYWNlLCBmbG9hdCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHkpOwotICAgIHZvaWQgbGF5b3V0 Q29sdW1uUmV2ZXJzZShGbGV4T3JkZXJJdGVyYXRvciYsIGNvbnN0IFdURjo6VmVjdG9yPExheW91 dFVuaXQ+JiBjaGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQg dG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5KTsKLSAgICB2b2lkIGFsaWduQ2hpbGRyZW4oRmxleE9y ZGVySXRlcmF0b3ImLCBMYXlvdXRVbml0IG1heEFzY2VudCk7CisgICAgdm9pZCBsYXlvdXRBbmRQ bGFjZUNoaWxkcmVuKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBjb25zdCBXVEY6OlZlY3Rv cjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2Us IGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSk7CisgICAgdm9pZCBsYXlvdXRDb2x1bW5S ZXZlcnNlKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBjb25zdCBXVEY6OlZlY3RvcjxMYXlv dXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0 IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSk7CisgICAgdm9pZCBhbGlnbkNoaWxkcmVuKGNvbnN0 IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBMYXlvdXRVbml0IG1heEFzY2VudCk7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg==