12114 2007-01-04 13:33:43 -0800 Clearing a float with an element that floats causes problem with next float in the opposite direction 2007-03-15 07:29:13 -0700 1 1 1 Unclassified WebKit CSS 420+ Mac OS X 10.4 RESOLVED INVALID http://level39.com/clearing-bug/ HasReduction P2 Major --- 9610 1 dan hyatt mitz oldest_to_newest 37098 0 dan 2007-01-04 13:33:43 -0800 If you have an element set to float:right; and you follow it with another element set to clear:right; float:right; and then follow those first two elements with a third element set to float:left; the third element will not float next to the first element, even though it is not being cleared. This bug is also present when the float directions are reversed from the example described above. 37095 1 12224 dan 2007-01-04 13:36:15 -0800 Created attachment 12224 Test case of the clearing bug. 37096 2 dan 2007-01-04 13:39:47 -0800 See the following link for a more real-world example of this bug: http://level39.com/clearing-bug/layout.html 37047 3 12229 hyatt 2007-01-04 14:41:46 -0800 Created attachment 12229 Patch that does left/right y-computations separately. This patch makes sure the "don't go above the previous float" rule treats left and right separately. 37049 4 12229 aroben 2007-01-04 14:48:29 -0800 Comment on attachment 12229 Patch that does left/right y-computations separately. + FloatingObject* lastFloat = f; Might as well initialize this to f->prev() to save an unnecessary pass through the while loop. r=me 37052 5 hyatt 2007-01-04 15:14:39 -0800 Fixed. 36889 6 dbaron 2007-01-05 07:40:36 -0800 This bug is invalid. The previous behavior was correct. CSS2 9.5.1 rule 5 says: The outer top of a floating box may not be higher than the outer top of any block or floated box generated by an element earlier in the source document. (Below the rules, it says: References to other elements in these rules refer only to other elements in the same block formatting context as the float.) http://www.w3.org/TR/CSS21/visuren.html#float-position 36874 7 dan 2007-01-05 09:04:54 -0800 Can we get clarification on this? 36859 8 hyatt 2007-01-05 12:45:53 -0800 Yeah, rule 5 is clear. I missed that. This bug was invalid. Will attach a new patch that backs out the behavior but retains the code cleanup. 36858 9 hyatt 2007-01-05 12:46:52 -0800 For what it's worth, I do like the behavior I just implemented. Too bad it doesn't match the spec. :( 36824 10 12246 hyatt 2007-01-05 13:08:32 -0800 Created attachment 12246 Patch that backs out this behavior and reverts to old behavior (while keeping code cleanup) 36827 11 12246 mitz 2007-01-05 13:11:30 -0800 Comment on attachment 12246 Patch that backs out this behavior and reverts to old behavior (while keeping code cleanup) r=me 36829 12 hyatt 2007-01-05 13:14:19 -0800 Ok fixed. 12224 2007-01-04 13:36:15 -0800 2007-01-04 13:36:15 -0800 Test case of the clearing bug. clearing-bug.html text/html 1227 dan PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgVHJhbnNpdGlvbmFs Ly9FTiIKICAgICAgICAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtdHJh bnNpdGlvbmFsLmR0ZCI+CjxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1s IiB4bWw6bGFuZz0iZW4iIGxhbmc9ImVuIj4KPGhlYWQ+CiAgPG1ldGEgaHR0cC1lcXVpdj0iY29u dGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiIC8+CiAgPHRpdGxl PkNsZWFyaW5nIGJ1ZzwvdGl0bGU+CiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgIGRpdiB7 cGFkZGluZzogMjBweDt9CiAgICAjbnVtYmVyMSB7ZmxvYXQ6cmlnaHQ7YmFja2dyb3VuZC1jb2xv cjojYzY2O30KICAgICNudW1iZXIyIHtjbGVhcjpyaWdodDtmbG9hdDpyaWdodDtiYWNrZ3JvdW5k LWNvbG9yOiM5YzY7fQogICAgI251bWJlcjMge2Zsb2F0OmxlZnQ7YmFja2dyb3VuZC1jb2xvcjoj NjlmO30KICA8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgogIDxkaXYgaWQ9Im51bWJlcjEiPkRJViBO VU1CRVIgMTogZmxvYXQ6cmlnaHQ7PC9kaXY+CiAgPGRpdiBpZD0ibnVtYmVyMiI+RElWIE5VTUJF UiAyOiBjbGVhcjpyaWdodDsgZmxvYXQ6cmlnaHQ7PC9kaXY+CiAgPGRpdiBpZD0ibnVtYmVyMyI+ RElWIE5VTUJFUiAzOiBmbG9hdDpsZWZ0OzwvZGl2PgogIDxwPlRoZSBmaXJzdCBlbGVtZW50IGlz IGZsb2F0ZWQgdG8gdGhlIHJpZ2h0LiBUaGUgc2Vjb25kIGVsZW1lbnQgY2xlYXJzIHRoZSByaWdo dCBmbG9hdCBhbmQgYWxzbyBmbG9hdHMgcmlnaHQuIFRoZSB0aGlyZCBlbGVtZW50IGlzIGZsb2F0 ZWQgdG8gdGhlIGxlZnQsIGJ1dCBpcyBmb3JjZWQgYmVsb3cgdGhlIGJvdHRvbSBvZiB0aGUgZmly c3QgZWxlbWVudC4gWWV0LCBzb21laG93IHRoaXMgcGFyYWdyYXBoIGNvbWVzIGF0IHRoZSBlbmQg b2YgdGhlIG1hcmt1cCwgYW5kIG1hbmFnZXMgdG8gcmlzZSB0byB0aGUgdG9wIG9mIHRoZSBwYWdl LiBUaGlzIGJlaGF2aW9yIGlzIHByZXNlbnQgaW4gRmlyZWZveCwgU2FmYXJpIGFuZCBPcGVyYS4g PGEgaHJlZj0iaHR0cDovL2xldmVsMzkuY29tL2NsZWFyaW5nLWJ1Zy9sYXlvdXQuaHRtbCI+PHN0 cm9uZz5DbGljayBoZXJlIGZvciBhIHJlYWwgd29ybGQgZXhhbXBsZSBvZiB0aGlzIGJ1Zy48L3N0 cm9uZz48L2E+PC9wPgo8L2JvZHk+CjwvaHRtbD4K 12229 2007-01-04 14:41:46 -0800 2007-01-05 13:08:32 -0800 Patch that does left/right y-computations separately. patch.txt text/plain 5270 hyatt SW5kZXg6IHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMTg1ODYpCisrKyByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAzLDM2ICsxOTAzLDU2IEBACiAKIHZvaWQgUmVu ZGVyQmxvY2s6OnBvc2l0aW9uTmV3RmxvYXRzKCkKIHsKLSAgICBpZighbV9mbG9hdGluZ09iamVj dHMpIHJldHVybjsKLSAgICBGbG9hdGluZ09iamVjdCAqZiA9IG1fZmxvYXRpbmdPYmplY3RzLT5s YXN0KCk7Ci0gICAgaWYoIWYgfHwgZi0+c3RhcnRZICE9IC0xKSByZXR1cm47Ci0gICAgRmxvYXRp bmdPYmplY3QgKmxhc3RGbG9hdDsKLSAgICB3aGlsZSgxKQotICAgIHsKLSAgICAgICAgbGFzdEZs b2F0ID0gbV9mbG9hdGluZ09iamVjdHMtPmdldFByZXYoKTsKLSAgICAgICAgaWYgKCFsYXN0Rmxv YXQgfHwgbGFzdEZsb2F0LT5zdGFydFkgIT0gLTEpCi0gICAgICAgICAgICBicmVhazsgICAgICAg IAotICAgICAgICBmID0gbV9mbG9hdGluZ09iamVjdHMtPnByZXYoKTsKLSAgICB9CisgICAgaWYg KCFtX2Zsb2F0aW5nT2JqZWN0cykKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIEZsb2F0aW5n T2JqZWN0KiBmID0gbV9mbG9hdGluZ09iamVjdHMtPmxhc3QoKTsKIAorICAgIC8vIElmIGFsbCBm bG9hdHMgaGF2ZSBhbHJlYWR5IGJlZW4gcG9zaXRpb25lZCwgdGhlbiB3ZSBoYXZlIG5vIHdvcmsg dG8gZG8uCisgICAgaWYgKCFmIHx8IGYtPnN0YXJ0WSAhPSAtMSkKKyAgICAgICAgcmV0dXJuOwog Ci0gICAgaW50IHkgPSBtX2hlaWdodDsKKyAgICAvLyBNb3ZlIGJhY2t3YXJkcyB0aHJvdWdoIG91 ciBmbG9hdGluZyBvYmplY3QgbGlzdCB1bnRpbCB3ZSBmaW5kIGEgZmxvYXQgdGhhdCBoYXMKKyAg ICAvLyBhbHJlYWR5IGJlZW4gcG9zaXRpb25lZC4gIFRoZW4gd2UnbGwgYmUgYWJsZSB0byBtb3Zl IGZvcndhcmQsIHBvc2l0aW9uaW5nIGFsbCBvZgorICAgIC8vIHRoZSBuZXcgZmxvYXRzIHRoYXQg bmVlZCBpdC4KKyAgICBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0ID0gZjsKKyAgICB3aGlsZSAo bGFzdEZsb2F0ICYmIGxhc3RGbG9hdC0+c3RhcnRZID09IC0xKSB7CisgICAgICAgIGYgPSBsYXN0 RmxvYXQ7CisgICAgICAgIGxhc3RGbG9hdCA9IG1fZmxvYXRpbmdPYmplY3RzLT5wcmV2KCk7Cisg ICAgfQogCisgICAgaW50IGxlZnRZID0gbV9oZWlnaHQ7CisgICAgaW50IHJpZ2h0WSA9IG1faGVp Z2h0OworICAgIAorICAgIC8vIFRoZSBmbG9hdCBjYW5ub3Qgc3RhcnQgYWJvdmUgdGhlIHkgcG9z aXRpb24gb2YgdGhlIGxhc3QgcG9zaXRpb25lZCBmbG9hdCB3aXRoIHRoZSBzYW1lCisgICAgLy8g YWxpZ25tZW50IHR5cGUuICBGaWd1cmUgb3V0IHdoYXQgdGhlc2UgdmFsdWVzIGFyZS4KKyAgICBi b29sIGxlZnRDaGVja2VkID0gZmFsc2U7CisgICAgYm9vbCByaWdodENoZWNrZWQgPSBmYWxzZTsK KyAgICBmb3IgKEZsb2F0aW5nT2JqZWN0KiBjdXJyRmxvYXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+ Y3VycmVudCgpOyBjdXJyRmxvYXQ7IGN1cnJGbG9hdCA9IG1fZmxvYXRpbmdPYmplY3RzLT5wcmV2 KCkpIHsKKyAgICAgICAgaWYgKCFsZWZ0Q2hlY2tlZCAmJiBjdXJyRmxvYXQtPnR5cGUoKSA9PSBG bG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KSB7CisgICAgICAgICAgICBsZWZ0WSA9IG1heChjdXJy RmxvYXQtPnN0YXJ0WSwgbGVmdFkpOworICAgICAgICAgICAgbGVmdENoZWNrZWQgPSB0cnVlOwor ICAgICAgICB9IGVsc2UgaWYgKCFyaWdodENoZWNrZWQgJiYgY3VyckZsb2F0LT50eXBlKCkgPT0g RmxvYXRpbmdPYmplY3Q6OkZsb2F0UmlnaHQpIHsKKyAgICAgICAgICAgIHJpZ2h0WSA9IG1heChj dXJyRmxvYXQtPnN0YXJ0WSwgcmlnaHRZKTsKKyAgICAgICAgICAgIHJpZ2h0Q2hlY2tlZCA9IHRy dWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGxlZnRDaGVja2VkICYmIHJpZ2h0Q2hlY2tlZCkK KyAgICAgICAgICAgIGJyZWFrOworICAgIH0KIAotICAgIC8vIHRoZSBmbG9hdCBjYW4gbm90IHN0 YXJ0IGFib3ZlIHRoZSB5IHBvc2l0aW9uIG9mIHRoZSBsYXN0IHBvc2l0aW9uZWQgZmxvYXQuCi0g ICAgaWYobGFzdEZsb2F0ICYmIGxhc3RGbG9hdC0+c3RhcnRZID4geSkKLSAgICAgICAgeSA9IGxh c3RGbG9hdC0+c3RhcnRZOwotCi0gICAgd2hpbGUoZikKLSAgICB7Ci0gICAgICAgIC8vc2tpcCBl bGVtZW50cyBjb3BpZWQgZnJvbSBlbHNld2hlcmUgYW5kIHBvc2l0aW9uZWQgZWxlbWVudHMKLSAg ICAgICAgaWYgKGYtPm5vZGUtPmNvbnRhaW5pbmdCbG9jaygpIT10aGlzKQotICAgICAgICB7Cisg ICAgLy8gTm93IHdhbGsgdGhyb3VnaCB0aGUgc2V0IG9mIHVucG9zaXRpb25lZCBmbG9hdHMgYW5k IHBsYWNlIHRoZW0uCisgICAgbV9mbG9hdGluZ09iamVjdHMtPmZpbmRSZWYoZik7CisgICAgd2hp bGUgKGYpIHsKKyAgICAgICAgLy8gVGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgcmVzcG9uc2libGUg Zm9yIHBvc2l0aW9uaW5nIGZsb2F0cywgc28gaWYgd2UgaGF2ZSBmbG9hdHMgaW4gb3VyCisgICAg ICAgIC8vIGxpc3QgdGhhdCBjb21lIGZyb20gc29tZXdoZXJlIGVsc2UsIGRvIG5vdCBhdHRlbXB0 IHRvIHBvc2l0aW9uIHRoZW0uCisgICAgICAgIGlmIChmLT5ub2RlLT5jb250YWluaW5nQmxvY2so KSAhPSB0aGlzKSB7CiAgICAgICAgICAgICBmID0gbV9mbG9hdGluZ09iamVjdHMtPm5leHQoKTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgUmVuZGVyT2JqZWN0 ICpvID0gZi0+bm9kZTsKKyAgICAgICAgaW50JiB5ID0gZi0+dHlwZSgpID09IEZsb2F0aW5nT2Jq ZWN0OjpGbG9hdExlZnQgPyBsZWZ0WSA6IHJpZ2h0WTsKKworICAgICAgICBSZW5kZXJPYmplY3Qq IG8gPSBmLT5ub2RlOwogICAgICAgICBpbnQgX2hlaWdodCA9IG8tPmhlaWdodCgpICsgby0+bWFy Z2luVG9wKCkgKyBvLT5tYXJnaW5Cb3R0b20oKTsKIAogICAgICAgICBpbnQgcm8gPSByaWdodE9m ZnNldCgpOyAvLyBDb25zdGFudCBwYXJ0IG9mIHJpZ2h0IG9mZnNldC4KQEAgLTE5NDMsMzkgKzE5 NjMsMzUgQEAKICAgICAgICAgCiAgICAgICAgIEludFJlY3Qgb2xkUmVjdChvLT54UG9zKCksIG8t PnlQb3MoKSAsIG8tPndpZHRoKCksIG8tPmhlaWdodCgpKTsKICAgICAgICAgCi0gICAgICAgIGlm ICggby0+c3R5bGUoKS0+Y2xlYXIoKSAmIENMRUZUICkKLSAgICAgICAgICAgIHkgPSBtYXgoIGxl ZnRCb3R0b20oKSwgeSApOworICAgICAgICBpZiAoby0+c3R5bGUoKS0+Y2xlYXIoKSAmIENMRUZU KQorICAgICAgICAgICAgeSA9IG1heChsZWZ0Qm90dG9tKCksIHkpOwogICAgICAgICBpZiAoIG8t PnN0eWxlKCktPmNsZWFyKCkgJiBDUklHSFQgKQotICAgICAgICAgICAgeSA9IG1heCggcmlnaHRC b3R0b20oKSwgeSApOworICAgICAgICAgICAgeSA9IG1heChyaWdodEJvdHRvbSgpLCB5KTsKIAot ICAgICAgICBpZiAoby0+c3R5bGUoKS0+ZmxvYXRpbmcoKSA9PSBGTEVGVCkKLSAgICAgICAgewor ICAgICAgICBpZiAoby0+c3R5bGUoKS0+ZmxvYXRpbmcoKSA9PSBGTEVGVCkgewogICAgICAgICAg ICAgaW50IGhlaWdodFJlbWFpbmluZ0xlZnQgPSAxOwogICAgICAgICAgICAgaW50IGhlaWdodFJl bWFpbmluZ1JpZ2h0ID0gMTsKICAgICAgICAgICAgIGludCBmeCA9IGxlZnRSZWxPZmZzZXQoeSxs bywgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdMZWZ0KTsKLSAgICAgICAgICAgIHdoaWxlIChyaWdo dFJlbE9mZnNldCh5LHJvLCBmYWxzZSwgJmhlaWdodFJlbWFpbmluZ1JpZ2h0KS1meCA8IGZ3aWR0 aCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB5ICs9IG1pbiggaGVpZ2h0UmVtYWlu aW5nTGVmdCwgaGVpZ2h0UmVtYWluaW5nUmlnaHQgKTsKKyAgICAgICAgICAgIHdoaWxlIChyaWdo dFJlbE9mZnNldCh5LHJvLCBmYWxzZSwgJmhlaWdodFJlbWFpbmluZ1JpZ2h0KS1meCA8IGZ3aWR0 aCkgeworICAgICAgICAgICAgICAgIHkgKz0gbWluKGhlaWdodFJlbWFpbmluZ0xlZnQsIGhlaWdo dFJlbWFpbmluZ1JpZ2h0KTsKICAgICAgICAgICAgICAgICBmeCA9IGxlZnRSZWxPZmZzZXQoeSxs bywgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdMZWZ0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIGlmIChmeDwwKSBmeD0wOworICAgICAgICAgICAgZnggPSBtYXgoMCwgZngpOwogICAgICAg ICAgICAgZi0+bGVmdCA9IGZ4OwogICAgICAgICAgICAgby0+c2V0UG9zKGZ4ICsgby0+bWFyZ2lu TGVmdCgpLCB5ICsgby0+bWFyZ2luVG9wKCkpOwotICAgICAgICB9Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgeworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaW50IGhlaWdodFJlbWFpbmlu Z0xlZnQgPSAxOwogICAgICAgICAgICAgaW50IGhlaWdodFJlbWFpbmluZ1JpZ2h0ID0gMTsKICAg ICAgICAgICAgIGludCBmeCA9IHJpZ2h0UmVsT2Zmc2V0KHkscm8sIGZhbHNlLCAmaGVpZ2h0UmVt YWluaW5nUmlnaHQpOwotICAgICAgICAgICAgd2hpbGUgKGZ4IC0gbGVmdFJlbE9mZnNldCh5LGxv LCBmYWxzZSwgJmhlaWdodFJlbWFpbmluZ0xlZnQpIDwgZndpZHRoKQotICAgICAgICAgICAgewor ICAgICAgICAgICAgd2hpbGUgKGZ4IC0gbGVmdFJlbE9mZnNldCh5LGxvLCBmYWxzZSwgJmhlaWdo dFJlbWFpbmluZ0xlZnQpIDwgZndpZHRoKSB7CiAgICAgICAgICAgICAgICAgeSArPSBtaW4oaGVp Z2h0UmVtYWluaW5nTGVmdCwgaGVpZ2h0UmVtYWluaW5nUmlnaHQpOwotICAgICAgICAgICAgICAg IGZ4ID0gcmlnaHRSZWxPZmZzZXQoeSxybywgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdSaWdodCk7 CisgICAgICAgICAgICAgICAgZnggPSByaWdodFJlbE9mZnNldCh5LCBybywgZmFsc2UsICZoZWln aHRSZW1haW5pbmdSaWdodCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoZng8Zi0+ d2lkdGgpIGZ4PWYtPndpZHRoOworICAgICAgICAgICAgZnggPSBtYXgoZi0+d2lkdGgsIGZ4KTsK ICAgICAgICAgICAgIGYtPmxlZnQgPSBmeCAtIGYtPndpZHRoOwogICAgICAgICAgICAgby0+c2V0 UG9zKGZ4IC0gby0+bWFyZ2luUmlnaHQoKSAtIG8tPndpZHRoKCksIHkgKyBvLT5tYXJnaW5Ub3Ao KSk7CiAgICAgICAgIH0KKwogICAgICAgICBmLT5zdGFydFkgPSB5OwogICAgICAgICBmLT5lbmRZ ID0gZi0+c3RhcnRZICsgX2hlaWdodDsKIAo= 12246 2007-01-05 13:08:32 -0800 2007-01-05 13:11:30 -0800 Patch that backs out this behavior and reverts to old behavior (while keeping code cleanup) patch.txt text/plain 2605 hyatt SW5kZXg6IHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMTg2MjEpCisrKyByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTE1LDMzICsxOTE1LDE5IEBACiAgICAgLy8gTW92 ZSBiYWNrd2FyZHMgdGhyb3VnaCBvdXIgZmxvYXRpbmcgb2JqZWN0IGxpc3QgdW50aWwgd2UgZmlu ZCBhIGZsb2F0IHRoYXQgaGFzCiAgICAgLy8gYWxyZWFkeSBiZWVuIHBvc2l0aW9uZWQuICBUaGVu IHdlJ2xsIGJlIGFibGUgdG8gbW92ZSBmb3J3YXJkLCBwb3NpdGlvbmluZyBhbGwgb2YKICAgICAv LyB0aGUgbmV3IGZsb2F0cyB0aGF0IG5lZWQgaXQuCi0gICAgRmxvYXRpbmdPYmplY3QqIGxhc3RG bG9hdCA9IG1fZmxvYXRpbmdPYmplY3RzLT5wcmV2KCk7CisgICAgRmxvYXRpbmdPYmplY3QqIGxh c3RGbG9hdCA9IG1fZmxvYXRpbmdPYmplY3RzLT5nZXRQcmV2KCk7CiAgICAgd2hpbGUgKGxhc3RG bG9hdCAmJiBsYXN0RmxvYXQtPnN0YXJ0WSA9PSAtMSkgewotICAgICAgICBmID0gbGFzdEZsb2F0 OwotICAgICAgICBsYXN0RmxvYXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+cHJldigpOworICAgICAg ICBmID0gbV9mbG9hdGluZ09iamVjdHMtPnByZXYoKTsKKyAgICAgICAgbGFzdEZsb2F0ID0gbV9m bG9hdGluZ09iamVjdHMtPmdldFByZXYoKTsKICAgICB9CiAKLSAgICBpbnQgbGVmdFkgPSBtX2hl aWdodDsKLSAgICBpbnQgcmlnaHRZID0gbV9oZWlnaHQ7CisgICAgaW50IHkgPSBtX2hlaWdodDsK ICAgICAKLSAgICAvLyBUaGUgZmxvYXQgY2Fubm90IHN0YXJ0IGFib3ZlIHRoZSB5IHBvc2l0aW9u IG9mIHRoZSBsYXN0IHBvc2l0aW9uZWQgZmxvYXQgd2l0aCB0aGUgc2FtZQotICAgIC8vIGFsaWdu bWVudCB0eXBlLiAgRmlndXJlIG91dCB3aGF0IHRoZXNlIHZhbHVlcyBhcmUuCi0gICAgYm9vbCBs ZWZ0Q2hlY2tlZCA9IGZhbHNlOwotICAgIGJvb2wgcmlnaHRDaGVja2VkID0gZmFsc2U7Ci0gICAg Zm9yIChGbG9hdGluZ09iamVjdCogY3VyckZsb2F0ID0gbV9mbG9hdGluZ09iamVjdHMtPmN1cnJl bnQoKTsgY3VyckZsb2F0OyBjdXJyRmxvYXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+cHJldigpKSB7 Ci0gICAgICAgIGlmICghbGVmdENoZWNrZWQgJiYgY3VyckZsb2F0LT50eXBlKCkgPT0gRmxvYXRp bmdPYmplY3Q6OkZsb2F0TGVmdCkgewotICAgICAgICAgICAgbGVmdFkgPSBtYXgoY3VyckZsb2F0 LT5zdGFydFksIGxlZnRZKTsKLSAgICAgICAgICAgIGxlZnRDaGVja2VkID0gdHJ1ZTsKLSAgICAg ICAgfSBlbHNlIGlmICghcmlnaHRDaGVja2VkICYmIGN1cnJGbG9hdC0+dHlwZSgpID09IEZsb2F0 aW5nT2JqZWN0OjpGbG9hdFJpZ2h0KSB7Ci0gICAgICAgICAgICByaWdodFkgPSBtYXgoY3VyckZs b2F0LT5zdGFydFksIHJpZ2h0WSk7Ci0gICAgICAgICAgICByaWdodENoZWNrZWQgPSB0cnVlOwot ICAgICAgICB9Ci0gICAgICAgIGlmIChsZWZ0Q2hlY2tlZCAmJiByaWdodENoZWNrZWQpCi0gICAg ICAgICAgICBicmVhazsKLSAgICB9CisgICAgLy8gVGhlIGZsb2F0IGNhbm5vdCBzdGFydCBhYm92 ZSB0aGUgeSBwb3NpdGlvbiBvZiB0aGUgbGFzdCBwb3NpdGlvbmVkIGZsb2F0LgorICAgIGlmIChs YXN0RmxvYXQpCisgICAgICAgIHkgPSBtYXgobGFzdEZsb2F0LT5zdGFydFksIHkpOwogCiAgICAg Ly8gTm93IHdhbGsgdGhyb3VnaCB0aGUgc2V0IG9mIHVucG9zaXRpb25lZCBmbG9hdHMgYW5kIHBs YWNlIHRoZW0uCi0gICAgbV9mbG9hdGluZ09iamVjdHMtPmZpbmRSZWYoZik7CiAgICAgd2hpbGUg KGYpIHsKICAgICAgICAgLy8gVGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgcmVzcG9uc2libGUgZm9y IHBvc2l0aW9uaW5nIGZsb2F0cywgc28gaWYgd2UgaGF2ZSBmbG9hdHMgaW4gb3VyCiAgICAgICAg IC8vIGxpc3QgdGhhdCBjb21lIGZyb20gc29tZXdoZXJlIGVsc2UsIGRvIG5vdCBhdHRlbXB0IHRv IHBvc2l0aW9uIHRoZW0uCkBAIC0xOTUwLDggKzE5MzYsNiBAQAogICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgIH0KIAotICAgICAgICBpbnQmIHkgPSBmLT50eXBlKCkgPT0gRmxvYXRpbmdP YmplY3Q6OkZsb2F0TGVmdCA/IGxlZnRZIDogcmlnaHRZOwotCiAgICAgICAgIFJlbmRlck9iamVj dCogbyA9IGYtPm5vZGU7CiAgICAgICAgIGludCBfaGVpZ2h0ID0gby0+aGVpZ2h0KCkgKyBvLT5t YXJnaW5Ub3AoKSArIG8tPm1hcmdpbkJvdHRvbSgpOwogCkBAIC0xOTY1LDcgKzE5NDksNyBAQAog ICAgICAgICAKICAgICAgICAgaWYgKG8tPnN0eWxlKCktPmNsZWFyKCkgJiBDTEVGVCkKICAgICAg ICAgICAgIHkgPSBtYXgobGVmdEJvdHRvbSgpLCB5KTsKLSAgICAgICAgaWYgKCBvLT5zdHlsZSgp LT5jbGVhcigpICYgQ1JJR0hUICkKKyAgICAgICAgaWYgKG8tPnN0eWxlKCktPmNsZWFyKCkgJiBD UklHSFQpCiAgICAgICAgICAgICB5ID0gbWF4KHJpZ2h0Qm90dG9tKCksIHkpOwogCiAgICAgICAg IGlmIChvLT5zdHlsZSgpLT5mbG9hdGluZygpID09IEZMRUZUKSB7Cg==