116058 2013-05-13 13:43:46 -0700 Roll out the flex-related changes to flexbox 2013-05-13 14:03:12 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt bdakin commit-queue esprehn+autocc glenn oldest_to_newest 888503 0 hyatt 2013-05-13 13:43:46 -0700 Roll out the layout optimizations to flexing. They aren't super-important anyway, and the repainting optimizations are still intact. 888508 1 201629 hyatt 2013-05-13 13:46:26 -0700 Created attachment 201629 Patch 888509 2 commit-queue 2013-05-13 13:48:59 -0700 Attachment 201629 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp']" exit_code: 1 Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:391: Omit int when using unsigned [runtime/unsigned] [1] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 888514 3 hyatt 2013-05-13 14:03:12 -0700 Landed in r150038. 201629 2013-05-13 13:46:26 -0700 2013-05-13 13:49:25 -0700 Patch patch.txt text/plain 8971 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDAzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA1LTEzICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9ucyBpbiBmbGV4Ym94 IGxheW91dCBjYXVzZWQgYnkgdGhlIGZsZXhpbmcgb3B0aW1pemF0aW9ucy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjA1OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTM4NjM2NDc+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSb2xsIG91dCB0aGUgZmxleC1yZWxhdGVkIGNoYW5nZXMg ZnJvbSByMTQ5NTk3IHNvIHRoYXQgdGhlIGxheW91dAorICAgICAgICBhbGdvcml0aG0gZ29lcyBi YWNrIHRvIHRoZSB3YXkgaXQgd2FzLiBMZWF2ZSB0aGUgcmVwYWludGluZyBvcHRpbWl6YXRpb25z CisgICAgICAgIGluIHBsYWNlIHRob3VnaC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJE ZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2F0aGVyRmxleENo aWxkcmVuSW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3g6OmxheW91dEhvcml6b250YWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveCk6CisKIDIwMTMtMDUtMTMgIFBoaWxp cHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxNTAwMTQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAkocmV2aXNpb24gMTUw MDMyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4OCwxOSArMzg4LDE3IEBAIHZvaWQgUmVuZGVy RGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXQKIH0KIAogLy8gVGhlIGZpcnN0IHdhbGsgb3Zl ciBvdXIga2lkcyBpcyB0byBmaW5kIG91dCBpZiB3ZSBoYXZlIGFueSBmbGV4aWJsZSBjaGlsZHJl bi4KLXN0YXRpYyB2b2lkIGdhdGhlckZsZXhDaGlsZHJlbkluZm8oRmxleEJveEl0ZXJhdG9yJiBp dGVyYXRvciwgdW5zaWduZWQmIGhpZ2hlc3RGbGV4R3JvdXAsIHVuc2lnbmVkJiBsb3dlc3RGbGV4 R3JvdXAsIGJvb2wmIGZsZXhpYmxlQ2hpbGRyZW5OZWVkTGF5b3V0LCB1bnNpZ25lZCYgZmxleGli bGVDaGlsZENvdW50KQorc3RhdGljIHZvaWQgZ2F0aGVyRmxleENoaWxkcmVuSW5mbyhGbGV4Qm94 SXRlcmF0b3ImIGl0ZXJhdG9yLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4sIHVuc2lnbmVkIGludCYg aGlnaGVzdEZsZXhHcm91cCwgdW5zaWduZWQgaW50JiBsb3dlc3RGbGV4R3JvdXAsIGJvb2wmIGhh dmVGbGV4KQogewogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7 IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICAvLyBDaGVjayB0byBz ZWUgaWYgdGhpcyBjaGlsZCBmbGV4ZXMuCi0gICAgICAgIGlmIChjaGlsZERvZXNOb3RBZmZlY3RX aWR0aE9yRmxleGluZyhjaGlsZCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgCi0g ICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+Ym94RmxleCgpID4gMC4wZikgeworICAgICAgICBp ZiAoIWNoaWxkRG9lc05vdEFmZmVjdFdpZHRoT3JGbGV4aW5nKGNoaWxkKSAmJiBjaGlsZC0+c3R5 bGUoKS0+Ym94RmxleCgpID4gMC4wZikgewogICAgICAgICAgICAgLy8gV2UgYWx3YXlzIGhhdmUg dG8gbGF5IG91dCBmbGV4aWJsZSBvYmplY3RzIGFnYWluLCBzaW5jZSB0aGUgZmxleCBkaXN0cmli dXRpb24KICAgICAgICAgICAgIC8vIG1heSBoYXZlIGNoYW5nZWQsIGFuZCB3ZSBuZWVkIHRvIHJl YWxsb2NhdGUgc3BhY2UuCi0gICAgICAgICAgICBmbGV4aWJsZUNoaWxkQ291bnQrKzsKLSAgICAg ICAgICAgIGlmIChjaGlsZC0+bmVlZHNMYXlvdXQoKSkKLSAgICAgICAgICAgICAgICBmbGV4aWJs ZUNoaWxkcmVuTmVlZExheW91dCA9IHRydWU7CisgICAgICAgICAgICBjaGlsZC0+Y2xlYXJPdmVy cmlkZVNpemUoKTsKKyAgICAgICAgICAgIGlmICghcmVsYXlvdXRDaGlsZHJlbikKKyAgICAgICAg ICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwor ICAgICAgICAgICAgaGF2ZUZsZXggPSB0cnVlOwogICAgICAgICAgICAgdW5zaWduZWQgaW50IGZs ZXhHcm91cCA9IGNoaWxkLT5zdHlsZSgpLT5ib3hGbGV4R3JvdXAoKTsKICAgICAgICAgICAgIGlm IChsb3dlc3RGbGV4R3JvdXAgPT0gMCkKICAgICAgICAgICAgICAgICBsb3dlc3RGbGV4R3JvdXAg PSBmbGV4R3JvdXA7CkBAIC00MzUsMTQgKzQzMyw4IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZs ZXhpYmxlQm94OjpsYXlvdXQKICAgICBGbGV4Qm94SXRlcmF0b3IgaXRlcmF0b3IodGhpcyk7CiAg ICAgdW5zaWduZWQgaW50IGhpZ2hlc3RGbGV4R3JvdXAgPSAwOwogICAgIHVuc2lnbmVkIGludCBs b3dlc3RGbGV4R3JvdXAgPSAwOwotICAgIGJvb2wgZmxleGluZ0NoaWxkcmVuID0gZmFsc2U7Ci0g ICAgYm9vbCBmbGV4aWJsZUNoaWxkcmVuTmVlZExheW91dCA9IHJlbGF5b3V0Q2hpbGRyZW47Ci0g ICAgdW5zaWduZWQgZmxleGlibGVDaGlsZENvdW50ID0gMDsKLSAgICBnYXRoZXJGbGV4Q2hpbGRy ZW5JbmZvKGl0ZXJhdG9yLCBoaWdoZXN0RmxleEdyb3VwLCBsb3dlc3RGbGV4R3JvdXAsIGZsZXhp YmxlQ2hpbGRyZW5OZWVkTGF5b3V0LCBmbGV4aWJsZUNoaWxkQ291bnQpOwotICAgIGJvb2wgaGF2 ZUZsZXggPSBmbGV4aWJsZUNoaWxkQ291bnQgPiAwOwotICAgIGJvb2wgaW5mbGV4aWJsZU9iamVj dHNFeHRlbnRDaGFuZ2VkID0gZmFsc2U7Ci0gICAgYm9vbCBkb2luZ0luZmxleGlibGVMYXlvdXRQ YXNzID0gdHJ1ZTsKLSAgICBib29sIGNsZWFyaW5nRmxleGlibGVJdGVtc092ZXJyaWRlUGFzcyA9 IGZhbHNlOworICAgIGJvb2wgaGF2ZUZsZXggPSBmYWxzZSwgZmxleGluZ0NoaWxkcmVuID0gZmFs c2U7IAorICAgIGdhdGhlckZsZXhDaGlsZHJlbkluZm8oaXRlcmF0b3IsIHJlbGF5b3V0Q2hpbGRy ZW4sIGhpZ2hlc3RGbGV4R3JvdXAsIGxvd2VzdEZsZXhHcm91cCwgaGF2ZUZsZXgpOwogCiAgICAg UmVuZGVyQmxvY2s6OnN0YXJ0RGVsYXlVcGRhdGVTY3JvbGxJbmZvKCk7CiAKQEAgLTQ3MywzMiAr NDY1LDE4IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXQKICAgICAg ICAgICAgIAogICAgICAgICAgICAgTGF5b3V0U2l6ZSYgY2hpbGRMYXlvdXREZWx0YSA9IGNoaWxk TGF5b3V0RGVsdGFzW2NoaWxkSW5kZXgrK107CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIC8v IEp1c3Qgc2tpcCB0aGUgZmxleGlibGUgaXRlbXMgaW5pdGlhbGx5LgotICAgICAgICAgICAgaWYg KGNoaWxkLT5zdHlsZSgpLT5ib3hGbGV4KCkgJiYgZG9pbmdJbmZsZXhpYmxlTGF5b3V0UGFzcykK LSAgICAgICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICAgICAgLy8gQ29tcHV0ZSB0aGUg Y2hpbGQncyB2ZXJ0aWNhbCBtYXJnaW5zLgogICAgICAgICAgICAgY2hpbGQtPmNvbXB1dGVBbmRT ZXRCbG9ja0RpcmVjdGlvbk1hcmdpbnModGhpcyk7CiAKICAgICAgICAgICAgIGlmICghY2hpbGQt Pm5lZWRzTGF5b3V0KCkpCiAgICAgICAgICAgICAgICAgY2hpbGQtPm1hcmtGb3JQYWdpbmF0aW9u UmVsYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAoY2xlYXJp bmdGbGV4aWJsZUl0ZW1zT3ZlcnJpZGVQYXNzICYmIGNoaWxkLT5zdHlsZSgpLT5ib3hGbGV4KCkp IHsKLSAgICAgICAgICAgICAgICBjaGlsZC0+Y2xlYXJPdmVycmlkZVNpemUoKTsKLSAgICAgICAg ICAgICAgICBjaGlsZC0+c2V0TmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlUaGlzKTsKLSAgICAg ICAgICAgIH0KLQotICAgICAgICAgICAgTGF5b3V0VW5pdCBvbGRDaGlsZFdpZHRoID0gY2hpbGQt PndpZHRoKCk7Ci0gICAgICAgICAgICAKICAgICAgICAgICAgIC8vIEFwcGx5IHRoZSBjaGlsZCdz IGN1cnJlbnQgbGF5b3V0IGRlbHRhLgogICAgICAgICAgICAgbGF5b3V0Q2hpbGRJZk5lZWRlZEFw cGx5aW5nRGVsdGEoY2hpbGQsIGNoaWxkTGF5b3V0RGVsdGEpOwogICAgICAgICAgICAgCiAgICAg ICAgICAgICAvLyBOb3cgZG8gdGhlIGxheW91dC4KICAgICAgICAgICAgIGxheW91dENoaWxkSWZO ZWVkZWRBcHBseWluZ0RlbHRhKGNoaWxkLCBjaGlsZExheW91dERlbHRhKTsKIAotICAgICAgICAg ICAgaWYgKGRvaW5nSW5mbGV4aWJsZUxheW91dFBhc3MgJiYgY2hpbGQtPndpZHRoKCkgIT0gb2xk Q2hpbGRXaWR0aCkKLSAgICAgICAgICAgICAgICBpbmZsZXhpYmxlT2JqZWN0c0V4dGVudENoYW5n ZWQgPSB0cnVlOwotCiAgICAgICAgICAgICAvLyBVcGRhdGUgb3VyIGhlaWdodCBhbmQgb3ZlcmZs b3cgaGVpZ2h0LgogICAgICAgICAgICAgaWYgKHN0eWxlKCktPmJveEFsaWduKCkgPT0gQkJBU0VM SU5FKSB7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnQgPSBjaGlsZC0+Zmlyc3RM aW5lQm94QmFzZWxpbmUoKTsKQEAgLTU1MSwxMCArNTI5LDYgQEAgdm9pZCBSZW5kZXJEZXByZWNh dGVkRmxleGlibGVCb3g6OmxheW91dAogICAgICAgICAgICAgCiAgICAgICAgICAgICBMYXlvdXRT aXplJiBjaGlsZExheW91dERlbHRhID0gY2hpbGRMYXlvdXREZWx0YXNbY2hpbGRJbmRleCsrXTsK ICAgICAgICAgICAgIAotICAgICAgICAgICAgLy8gSnVzdCBza2lwIHRoZSBmbGV4aWJsZSBpdGVt cyBpbml0aWFsbHkuCi0gICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPmJveEZsZXgoKSAm JiBkb2luZ0luZmxleGlibGVMYXlvdXRQYXNzKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLT52aXNpYmls aXR5KCkgPT0gQ09MTEFQU0UpIHsKICAgICAgICAgICAgICAgICAvLyB2aXNpYmlsaXR5OiBjb2xs YXBzZWQgY2hpbGRyZW4gZG8gbm90IHBhcnRpY2lwYXRlIGluIG91ciBwb3NpdGlvbmluZy4KICAg ICAgICAgICAgICAgICAvLyBCdXQgd2UgbmVlZCB0byBsYXkgdGhlbSBvdXQuCkBAIC02MDYsMTUg KzU4MCw2IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXQKIAogICAg ICAgICByZW1haW5pbmdTcGFjZSA9IGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkgKyBjb250 ZW50V2lkdGgoKSAtIHhQb3M7CiAKLSAgICAgICAgY2xlYXJpbmdGbGV4aWJsZUl0ZW1zT3ZlcnJp ZGVQYXNzID0gZmFsc2U7Ci0gICAgCi0gICAgICAgIGlmIChkb2luZ0luZmxleGlibGVMYXlvdXRQ YXNzKSB7Ci0gICAgICAgICAgICBkb2luZ0luZmxleGlibGVMYXlvdXRQYXNzID0gZmFsc2U7Ci0g ICAgICAgICAgICBpZiAoaW5mbGV4aWJsZU9iamVjdHNFeHRlbnRDaGFuZ2VkIHx8IChmbGV4aWJs ZUNoaWxkcmVuTmVlZExheW91dCAmJiBmbGV4aWJsZUNoaWxkQ291bnQgPiAxKSkKLSAgICAgICAg ICAgICAgICBjbGVhcmluZ0ZsZXhpYmxlSXRlbXNPdmVycmlkZVBhc3MgPSB0cnVlOwotICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLQogICAgICAgICBtX3N0cmV0Y2hpbmdDaGlsZHJl biA9IGZhbHNlOwogICAgICAgICBpZiAoZmxleGluZ0NoaWxkcmVuKQogICAgICAgICAgICAgaGF2 ZUZsZXggPSBmYWxzZTsgLy8gV2UncmUgZG9uZS4KQEAgLTc2OSwxNCArNzM0LDggQEAgdm9pZCBS ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91dAogICAgIEZsZXhCb3hJdGVyYXRvciBp dGVyYXRvcih0aGlzKTsKICAgICB1bnNpZ25lZCBpbnQgaGlnaGVzdEZsZXhHcm91cCA9IDA7CiAg ICAgdW5zaWduZWQgaW50IGxvd2VzdEZsZXhHcm91cCA9IDA7Ci0gICAgYm9vbCBmbGV4aW5nQ2hp bGRyZW4gPSBmYWxzZTsKLSAgICBib29sIGZsZXhpYmxlQ2hpbGRyZW5OZWVkTGF5b3V0ID0gcmVs YXlvdXRDaGlsZHJlbjsKLSAgICB1bnNpZ25lZCBmbGV4aWJsZUNoaWxkQ291bnQgPSAwOwotICAg IGdhdGhlckZsZXhDaGlsZHJlbkluZm8oaXRlcmF0b3IsIGhpZ2hlc3RGbGV4R3JvdXAsIGxvd2Vz dEZsZXhHcm91cCwgZmxleGlibGVDaGlsZHJlbk5lZWRMYXlvdXQsIGZsZXhpYmxlQ2hpbGRDb3Vu dCk7Ci0gICAgYm9vbCBoYXZlRmxleCA9IGZsZXhpYmxlQ2hpbGRDb3VudCA+IDA7Ci0gICAgYm9v bCBpbmZsZXhpYmxlT2JqZWN0c0V4dGVudENoYW5nZWQgPSBmYWxzZTsKLSAgICBib29sIGRvaW5n SW5mbGV4aWJsZUxheW91dFBhc3MgPSB0cnVlOwotICAgIGJvb2wgY2xlYXJpbmdGbGV4aWJsZUl0 ZW1zT3ZlcnJpZGVQYXNzID0gZmFsc2U7CisgICAgYm9vbCBoYXZlRmxleCA9IGZhbHNlLCBmbGV4 aW5nQ2hpbGRyZW4gPSBmYWxzZTsgCisgICAgZ2F0aGVyRmxleENoaWxkcmVuSW5mbyhpdGVyYXRv ciwgcmVsYXlvdXRDaGlsZHJlbiwgaGlnaGVzdEZsZXhHcm91cCwgbG93ZXN0RmxleEdyb3VwLCBo YXZlRmxleCk7CiAKICAgICAvLyBXZSBjb25maW5lIHRoZSBsaW5lIGNsYW1wIHVnbGluZXNzIHRv IHZlcnRpY2FsIGZsZXhpYmxlIGJveGVzICh0aHVzIGtlZXBpbmcgaXQgb3V0IG9mCiAgICAgLy8g bWFpbnN0cmVhbSBibG9jayBsYXlvdXQpOyB0aGlzIGlzIG5vdCByZWFsbHkgcGFydCBvZiB0aGUg WFVMIGJveCBtb2RlbC4KQEAgLTgxNiw5ICs3NzUsNiBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveDo6bGF5b3V0CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAg ICAgIExheW91dFNpemUmIGNoaWxkTGF5b3V0RGVsdGEgPSBjaGlsZExheW91dERlbHRhc1tjaGls ZEluZGV4KytdOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCkt PmJveEZsZXgoKSAmJiBkb2luZ0luZmxleGlibGVMYXlvdXRQYXNzKQotICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPnZpc2liaWxpdHko KSA9PSBDT0xMQVBTRSkgewogICAgICAgICAgICAgICAgIC8vIHZpc2liaWxpdHk6IGNvbGxhcHNl ZCBjaGlsZHJlbiBkbyBub3QgcGFydGljaXBhdGUgaW4gb3VyIHBvc2l0aW9uaW5nLgpAQCAtODM2 LDE5ICs3OTIsOSBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0CiAg ICAgICAgICAgICBpZiAoIWNoaWxkLT5uZWVkc0xheW91dCgpKQogICAgICAgICAgICAgICAgIGNo aWxkLT5tYXJrRm9yUGFnaW5hdGlvblJlbGF5b3V0SWZOZWVkZWQoKTsKIAotICAgICAgICAgICAg aWYgKGNsZWFyaW5nRmxleGlibGVJdGVtc092ZXJyaWRlUGFzcyAmJiBjaGlsZC0+c3R5bGUoKS0+ Ym94RmxleCgpKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGQtPmNsZWFyT3ZlcnJpZGVTaXplKCk7 Ci0gICAgICAgICAgICAgICAgY2hpbGQtPnNldE5lZWRzTGF5b3V0KHRydWUsIE1hcmtPbmx5VGhp cyk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIExheW91dFVuaXQgb2xkQ2hpbGRIZWln aHQgPSBjaGlsZC0+aGVpZ2h0KCk7Ci0KICAgICAgICAgICAgIC8vIE5vdyBkbyBhIGxheW91dC4K ICAgICAgICAgICAgIGxheW91dENoaWxkSWZOZWVkZWRBcHBseWluZ0RlbHRhKGNoaWxkLCBjaGls ZExheW91dERlbHRhKTsKIAotICAgICAgICAgICAgaWYgKGRvaW5nSW5mbGV4aWJsZUxheW91dFBh c3MgJiYgY2hpbGQtPmhlaWdodCgpICE9IG9sZENoaWxkSGVpZ2h0KQotICAgICAgICAgICAgICAg IGluZmxleGlibGVPYmplY3RzRXh0ZW50Q2hhbmdlZCA9IHRydWU7Ci0KICAgICAgICAgICAgIC8v IFdlIGNhbiBwbGFjZSB0aGUgY2hpbGQgbm93LCB1c2luZyBvdXIgdmFsdWUgb2YgYm94LWFsaWdu LgogICAgICAgICAgICAgTGF5b3V0VW5pdCBjaGlsZFggPSBib3JkZXJMZWZ0KCkgKyBwYWRkaW5n TGVmdCgpOwogICAgICAgICAgICAgc3dpdGNoIChzdHlsZSgpLT5ib3hBbGlnbigpKSB7CkBAIC04 OTYsMTUgKzg0Miw2IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXQK IAogICAgICAgICByZW1haW5pbmdTcGFjZSA9IGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpICsg Y29udGVudEhlaWdodCgpIC0geVBvczsKIAotICAgICAgICBjbGVhcmluZ0ZsZXhpYmxlSXRlbXNP dmVycmlkZVBhc3MgPSBmYWxzZTsKLQotICAgICAgICBpZiAoZG9pbmdJbmZsZXhpYmxlTGF5b3V0 UGFzcykgewotICAgICAgICAgICAgZG9pbmdJbmZsZXhpYmxlTGF5b3V0UGFzcyA9IGZhbHNlOwot ICAgICAgICAgICAgaWYgKGluZmxleGlibGVPYmplY3RzRXh0ZW50Q2hhbmdlZCB8fCAoZmxleGli bGVDaGlsZHJlbk5lZWRMYXlvdXQgJiYgZmxleGlibGVDaGlsZENvdW50ID4gMSkpCi0gICAgICAg ICAgICAgICAgY2xlYXJpbmdGbGV4aWJsZUl0ZW1zT3ZlcnJpZGVQYXNzID0gdHJ1ZTsKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KICAgICAgICAgaWYgKGZsZXhpbmdDaGlsZHJl bikKICAgICAgICAgICAgIGhhdmVGbGV4ID0gZmFsc2U7IC8vIFdlJ3JlIGRvbmUuCiAgICAgICAg IGVsc2UgaWYgKGhhdmVGbGV4KSB7Cg==