68590 2011-09-21 19:37:38 -0700 Floats pushed to next page don't reposition properly. 2011-09-22 09:32:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt aroben oldest_to_newest 471327 0 hyatt 2011-09-21 19:37:38 -0700 When a floating object is pushed to the next page, column or region as a result of either being unsplittable or because of a pagination strut, we need to recalculate its position. It may move to an area with more available width, below other floats, etc., 471328 1 108270 hyatt 2011-09-21 19:40:03 -0700 Created attachment 108270 Patch 471595 2 108270 aroben 2011-09-22 08:59:18 -0700 Comment on attachment 108270 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108270&action=review > Source/WebCore/rendering/RenderBlock.cpp:3272 > +LayoutPoint RenderBlock::computeLogicalLocationForFloat(FloatingObject* floatingObject, LayoutUnit floatLogicalTop, LayoutUnit leftOffset, LayoutUnit rightOffset, LayoutUnit floatLogicalWidth) Can this be a const member function? Can it take a const FloatingObject*? Is "location" specific enough in this function name? Should it say "top left" instead? It's confusing that you pass a value named floatLogicalTop into a function that is supposedly calculating that value for you. Is there a clearer way we can name the parameter that makes it clear what the caller has to do when calculating that value vs. what the function will do based on that value? > LayoutTests/ChangeLog:11 > + * fast/regions/webkit-flow-floats-inside-regions-bounds-expected.txt: Don't you need to update pixel results, too? 471624 3 hyatt 2011-09-22 09:32:54 -0700 Fixed in r95724. 108270 2011-09-21 19:40:03 -0700 2011-09-22 08:59:18 -0700 Patch patch.txt text/plain 14983 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1Njk2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDktMjEgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02ODU5MAorICAgICAgICAKKyAgICAgICAgRmxvYXRzIHB1c2hlZCB0 byBuZXh0IHBhZ2UsIGNvbHVtbiBvciByZWdpb24gZG9uJ3QgcmVwb3NpdGlvbiBwcm9wZXJseSBp ZiB0aGUgYW1vdW50IG9mCisgICAgICAgIGF2YWlsYWJsZSBsb2dpY2FsIHdpZHRoIGF0IHRoZSBu ZXcgcG9zaXRpb24gY2hhbmdlcy4gUmVmYWN0b3IgdGhlIGNvZGUgc28gdGhhdCB3ZSBjYW4KKyAg ICAgICAgcnVuIHRoZSBmbG9hdCBwbGFjZW1lbnQgYWxnb3JpdGhtIGFnYWluIHdoZW4gdGhpcyBo YXBwZW5zLgorCisgICAgICAgIENvdmVyZWQgYnkgYW4gZXhpc3RpbmcgcmVnaW9ucyB0ZXN0IHRo YXQgZXhwb3NlcyB0aGUgaXNzdWUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVMb2dpY2FsTG9jYXRpb25Gb3JGbG9hdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cG9zaXRpb25OZXdGbG9hdHMpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorCiAyMDExLTA5LTIxICBUaW0gSG9ydG9uICA8dGlt b3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtDR10gSW1hZ2VCdWZmZXJEYXRhOjpn ZXREYXRhIGhhcyBhbiBpbnZhcmlhbnQgY29tcGFyaXNvbiBpbiB0aGUgaW5uZXIgcGFydCBvZiBh IGxvb3Agd2hpY2ggZG9lc24ndCBnZXQgb3B0aW1pemVkIG91dApJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA5NTY3NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyNjks NiArMzI2OSwzNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpyZW1vdmVGbG9hdGluZ09iamVjdHNCCiAg ICAgfQogfQogCitMYXlvdXRQb2ludCBSZW5kZXJCbG9jazo6Y29tcHV0ZUxvZ2ljYWxMb2NhdGlv bkZvckZsb2F0KEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCwgTGF5b3V0VW5pdCBmbG9h dExvZ2ljYWxUb3AsIExheW91dFVuaXQgbGVmdE9mZnNldCwgTGF5b3V0VW5pdCByaWdodE9mZnNl dCwgTGF5b3V0VW5pdCBmbG9hdExvZ2ljYWxXaWR0aCkKK3sKKyAgICBSZW5kZXJCb3gqIGNoaWxk Qm94ID0gZmxvYXRpbmdPYmplY3QtPnJlbmRlcmVyKCk7CisKKyAgICBMYXlvdXRVbml0IGZsb2F0 TG9naWNhbExlZnQ7CisKKyAgICBpZiAoY2hpbGRCb3gtPnN0eWxlKCktPmZsb2F0aW5nKCkgPT0g TGVmdEZsb2F0KSB7CisgICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVtYWluaW5nTGVmdCA9IDE7 CisgICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVtYWluaW5nUmlnaHQgPSAxOworICAgICAgICBm bG9hdExvZ2ljYWxMZWZ0ID0gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGZsb2F0TG9naWNhbFRv cCwgbGVmdE9mZnNldCwgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdMZWZ0KTsKKyAgICAgICAgd2hp bGUgKGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoZmxvYXRMb2dpY2FsVG9wLCByaWdodE9mZnNl dCwgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdSaWdodCkgLSBmbG9hdExvZ2ljYWxMZWZ0IDwgZmxv YXRMb2dpY2FsV2lkdGgpIHsKKyAgICAgICAgICAgIGZsb2F0TG9naWNhbFRvcCArPSBtaW4oaGVp Z2h0UmVtYWluaW5nTGVmdCwgaGVpZ2h0UmVtYWluaW5nUmlnaHQpOworICAgICAgICAgICAgZmxv YXRMb2dpY2FsTGVmdCA9IGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShmbG9hdExvZ2ljYWxUb3As IGxlZnRPZmZzZXQsIGZhbHNlLCAmaGVpZ2h0UmVtYWluaW5nTGVmdCk7CisgICAgICAgIH0KKyAg ICAgICAgZmxvYXRMb2dpY2FsTGVmdCA9IG1heDxMYXlvdXRVbml0PigwLCBmbG9hdExvZ2ljYWxM ZWZ0KTsKKyAgICB9IGVsc2UgeworICAgICAgICBMYXlvdXRVbml0IGhlaWdodFJlbWFpbmluZ0xl ZnQgPSAxOworICAgICAgICBMYXlvdXRVbml0IGhlaWdodFJlbWFpbmluZ1JpZ2h0ID0gMTsKKyAg ICAgICAgZmxvYXRMb2dpY2FsTGVmdCA9IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoZmxvYXRM b2dpY2FsVG9wLCByaWdodE9mZnNldCwgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdSaWdodCk7Cisg ICAgICAgIHdoaWxlIChmbG9hdExvZ2ljYWxMZWZ0IC0gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5l KGZsb2F0TG9naWNhbFRvcCwgbGVmdE9mZnNldCwgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdMZWZ0 KSA8IGZsb2F0TG9naWNhbFdpZHRoKSB7CisgICAgICAgICAgICBmbG9hdExvZ2ljYWxUb3AgKz0g bWluKGhlaWdodFJlbWFpbmluZ0xlZnQsIGhlaWdodFJlbWFpbmluZ1JpZ2h0KTsKKyAgICAgICAg ICAgIGZsb2F0TG9naWNhbExlZnQgPSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKGZsb2F0TG9n aWNhbFRvcCwgcmlnaHRPZmZzZXQsIGZhbHNlLCAmaGVpZ2h0UmVtYWluaW5nUmlnaHQpOworICAg ICAgICB9CisgICAgICAgIGZsb2F0TG9naWNhbExlZnQgLT0gbG9naWNhbFdpZHRoRm9yRmxvYXQo ZmxvYXRpbmdPYmplY3QpOyAvLyBVc2UgdGhlIG9yaWdpbmFsIHdpZHRoIG9mIHRoZSBmbG9hdCBo ZXJlLCBzaW5jZSB0aGUgbG9jYWwgdmFyaWFibGUKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHxmbG9hdExvZ2ljYWxX aWR0aHwgd2FzIGNhcHBlZCB0byB0aGUgYXZhaWxhYmxlIGxpbmUgd2lkdGguCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBTZWUgZmFzdC9ibG9jay9mbG9hdC9jbGFtcGVkLXJpZ2h0LWZsb2F0Lmh0bWwuCisgICAgfQor ICAgIAorICAgIHJldHVybiBMYXlvdXRQb2ludChmbG9hdExvZ2ljYWxMZWZ0LCBmbG9hdExvZ2lj YWxUb3ApOworfQorCiBib29sIFJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0cygpCiB7CiAg ICAgaWYgKCFtX2Zsb2F0aW5nT2JqZWN0cykKQEAgLTMzMDcsNyArMzMzOCw3IEBAIGJvb2wgUmVu ZGVyQmxvY2s6OnBvc2l0aW9uTmV3RmxvYXRzKCkKICAgICBGbG9hdGluZ09iamVjdFNldEl0ZXJh dG9yIGVuZCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwogICAgIC8vIE5vdyB3YWxrIHRocm91 Z2ggdGhlIHNldCBvZiB1bnBvc2l0aW9uZWQgZmxvYXRzIGFuZCBwbGFjZSB0aGVtLgogICAgIGZv ciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgIEZsb2F0aW5nT2JqZWN0KiBmbG9hdGlu Z09iamVjdCA9ICppdDsKKyAgICAgICAgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0ID0g Kml0OwogICAgICAgICAvLyBUaGUgY29udGFpbmluZyBibG9jayBpcyByZXNwb25zaWJsZSBmb3Ig cG9zaXRpb25pbmcgZmxvYXRzLCBzbyBpZiB3ZSBoYXZlIGZsb2F0cyBpbiBvdXIKICAgICAgICAg Ly8gbGlzdCB0aGF0IGNvbWUgZnJvbSBzb21ld2hlcmUgZWxzZSwgZG8gbm90IGF0dGVtcHQgdG8g cG9zaXRpb24gdGhlbS4gQWxzbyBkb24ndCBhdHRlbXB0IHRvIGhhbmRsZQogICAgICAgICAvLyBw b3NpdGlvbmVkIGZsb2F0cywgc2luY2UgdGhlIHBvc2l0aW9uaW5nIGxheW91dCBjb2RlIGhhbmRs ZXMgdGhvc2UuCkBAIC0zMzMwLDMyICszMzYxLDExIEBAIGJvb2wgUmVuZGVyQmxvY2s6OnBvc2l0 aW9uTmV3RmxvYXRzKCkKICAgICAgICAgaWYgKGNoaWxkQm94LT5zdHlsZSgpLT5jbGVhcigpICYg Q1JJR0hUKQogICAgICAgICAgICAgbG9naWNhbFRvcCA9IG1heChsb3dlc3RGbG9hdExvZ2ljYWxC b3R0b20oRmxvYXRpbmdPYmplY3Q6OkZsb2F0UmlnaHQpLCBsb2dpY2FsVG9wKTsKIAotICAgICAg ICBMYXlvdXRVbml0IGZsb2F0TG9naWNhbExlZnQ7Ci0gICAgICAgIGlmIChjaGlsZEJveC0+c3R5 bGUoKS0+ZmxvYXRpbmcoKSA9PSBMZWZ0RmxvYXQpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQg aGVpZ2h0UmVtYWluaW5nTGVmdCA9IDE7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IGhlaWdodFJl bWFpbmluZ1JpZ2h0ID0gMTsKLSAgICAgICAgICAgIGZsb2F0TG9naWNhbExlZnQgPSBsb2dpY2Fs TGVmdE9mZnNldEZvckxpbmUobG9naWNhbFRvcCwgbGVmdE9mZnNldCwgZmFsc2UsICZoZWlnaHRS ZW1haW5pbmdMZWZ0KTsKLSAgICAgICAgICAgIHdoaWxlIChsb2dpY2FsUmlnaHRPZmZzZXRGb3JM aW5lKGxvZ2ljYWxUb3AsIHJpZ2h0T2Zmc2V0LCBmYWxzZSwgJmhlaWdodFJlbWFpbmluZ1JpZ2h0 KSAtIGZsb2F0TG9naWNhbExlZnQgPCBmbG9hdExvZ2ljYWxXaWR0aCkgewotICAgICAgICAgICAg ICAgIGxvZ2ljYWxUb3AgKz0gbWluKGhlaWdodFJlbWFpbmluZ0xlZnQsIGhlaWdodFJlbWFpbmlu Z1JpZ2h0KTsKLSAgICAgICAgICAgICAgICBmbG9hdExvZ2ljYWxMZWZ0ID0gbG9naWNhbExlZnRP ZmZzZXRGb3JMaW5lKGxvZ2ljYWxUb3AsIGxlZnRPZmZzZXQsIGZhbHNlLCAmaGVpZ2h0UmVtYWlu aW5nTGVmdCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBmbG9hdExvZ2ljYWxMZWZ0ID0g bWF4PExheW91dFVuaXQ+KDAsIGZsb2F0TG9naWNhbExlZnQpOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRSZW1haW5pbmdMZWZ0ID0gMTsKLSAgICAgICAg ICAgIExheW91dFVuaXQgaGVpZ2h0UmVtYWluaW5nUmlnaHQgPSAxOwotICAgICAgICAgICAgZmxv YXRMb2dpY2FsTGVmdCA9IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUobG9naWNhbFRvcCwgcmln aHRPZmZzZXQsIGZhbHNlLCAmaGVpZ2h0UmVtYWluaW5nUmlnaHQpOwotICAgICAgICAgICAgd2hp bGUgKGZsb2F0TG9naWNhbExlZnQgLSBsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUobG9naWNhbFRv cCwgbGVmdE9mZnNldCwgZmFsc2UsICZoZWlnaHRSZW1haW5pbmdMZWZ0KSA8IGZsb2F0TG9naWNh bFdpZHRoKSB7Ci0gICAgICAgICAgICAgICAgbG9naWNhbFRvcCArPSBtaW4oaGVpZ2h0UmVtYWlu aW5nTGVmdCwgaGVpZ2h0UmVtYWluaW5nUmlnaHQpOwotICAgICAgICAgICAgICAgIGZsb2F0TG9n aWNhbExlZnQgPSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKGxvZ2ljYWxUb3AsIHJpZ2h0T2Zm c2V0LCBmYWxzZSwgJmhlaWdodFJlbWFpbmluZ1JpZ2h0KTsKLSAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIGZsb2F0TG9naWNhbExlZnQgLT0gbG9naWNhbFdpZHRoRm9yRmxvYXQoZmxvYXRpbmdP YmplY3QpOyAvLyBVc2UgdGhlIG9yaWdpbmFsIHdpZHRoIG9mIHRoZSBmbG9hdCBoZXJlLCBzaW5j ZSB0aGUgbG9jYWwgdmFyaWFibGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB8ZmxvYXRMb2dpY2FsV2lkdGh8 IHdhcyBjYXBwZWQgdG8gdGhlIGF2YWlsYWJsZSBsaW5lIHdpZHRoLgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8v IFNlZSBmYXN0L2Jsb2NrL2Zsb2F0L2NsYW1wZWQtcmlnaHQtZmxvYXQuaHRtbC4KLSAgICAgICAg fQotICAgICAgICAKLSAgICAgICAgc2V0TG9naWNhbExlZnRGb3JGbG9hdChmbG9hdGluZ09iamVj dCwgZmxvYXRMb2dpY2FsTGVmdCk7Ci0gICAgICAgIHNldExvZ2ljYWxMZWZ0Rm9yQ2hpbGQoY2hp bGRCb3gsIGZsb2F0TG9naWNhbExlZnQgKyBjaGlsZExvZ2ljYWxMZWZ0TWFyZ2luKTsKLSAgICAg ICAgc2V0TG9naWNhbFRvcEZvckNoaWxkKGNoaWxkQm94LCBsb2dpY2FsVG9wICsgbWFyZ2luQmVm b3JlRm9yQ2hpbGQoY2hpbGRCb3gpKTsKKyAgICAgICAgTGF5b3V0UG9pbnQgZmxvYXRMb2dpY2Fs TG9jYXRpb24gPSBjb21wdXRlTG9naWNhbExvY2F0aW9uRm9yRmxvYXQoZmxvYXRpbmdPYmplY3Qs IGxvZ2ljYWxUb3AsIGxlZnRPZmZzZXQsIHJpZ2h0T2Zmc2V0LCBmbG9hdExvZ2ljYWxXaWR0aCk7 CisKKyAgICAgICAgc2V0TG9naWNhbExlZnRGb3JGbG9hdChmbG9hdGluZ09iamVjdCwgZmxvYXRM b2dpY2FsTG9jYXRpb24ueCgpKTsKKyAgICAgICAgc2V0TG9naWNhbExlZnRGb3JDaGlsZChjaGls ZEJveCwgZmxvYXRMb2dpY2FsTG9jYXRpb24ueCgpICsgY2hpbGRMb2dpY2FsTGVmdE1hcmdpbik7 CisgICAgICAgIHNldExvZ2ljYWxUb3BGb3JDaGlsZChjaGlsZEJveCwgZmxvYXRMb2dpY2FsTG9j YXRpb24ueSgpICsgbWFyZ2luQmVmb3JlRm9yQ2hpbGQoY2hpbGRCb3gpKTsKIAogICAgICAgICBp ZiAodmlldygpLT5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpKSB7CiAgICAgICAgICAgICBS ZW5kZXJCbG9jayogY2hpbGRCbG9jayA9IGNoaWxkQm94LT5pc1JlbmRlckJsb2NrKCkgPyB0b1Jl bmRlckJsb2NrKGNoaWxkQm94KSA6IDA7CkBAIC0zMzY2LDcgKzMzNzYsNyBAQCBib29sIFJlbmRl ckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0cygpCiAKICAgICAgICAgICAgIC8vIElmIHdlIGFyZSB1 bnNwbGl0dGFibGUgYW5kIGRvbid0IGZpdCwgdGhlbiB3ZSBuZWVkIHRvIG1vdmUgZG93bi4KICAg ICAgICAgICAgIC8vIFdlIGluY2x1ZGUgb3VyIG1hcmdpbnMgYXMgcGFydCBvZiB0aGUgdW5zcGxp dHRhYmxlIGFyZWEuCi0gICAgICAgICAgICBMYXlvdXRVbml0IG5ld0xvZ2ljYWxUb3AgPSBhZGp1 c3RGb3JVbnNwbGl0dGFibGVDaGlsZChjaGlsZEJveCwgbG9naWNhbFRvcCwgdHJ1ZSk7CisgICAg ICAgICAgICBMYXlvdXRVbml0IG5ld0xvZ2ljYWxUb3AgPSBhZGp1c3RGb3JVbnNwbGl0dGFibGVD aGlsZChjaGlsZEJveCwgZmxvYXRMb2dpY2FsTG9jYXRpb24ueSgpLCB0cnVlKTsKICAgICAgICAg ICAgIAogICAgICAgICAgICAgLy8gU2VlIGlmIHdlIGhhdmUgYSBwYWdpbmF0aW9uIHN0cnV0IHRo YXQgaXMgbWFraW5nIHVzIG1vdmUgZG93biBmdXJ0aGVyLgogICAgICAgICAgICAgLy8gTm90ZSB0 aGF0IGFuIHVuc3BsaXR0YWJsZSBjaGlsZCBjYW4ndCBhbHNvIGhhdmUgYSBwYWdpbmF0aW9uIHN0 cnV0LCBzbyB0aGlzIGlzCkBAIC0zMzc2LDE3ICszMzg2LDIxIEBAIGJvb2wgUmVuZGVyQmxvY2s6 OnBvc2l0aW9uTmV3RmxvYXRzKCkKICAgICAgICAgICAgICAgICBjaGlsZEJsb2NrLT5zZXRQYWdp bmF0aW9uU3RydXQoMCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAg IGlmIChuZXdMb2dpY2FsVG9wICE9IGxvZ2ljYWxUb3ApIHsKLSAgICAgICAgICAgICAgICBmbG9h dGluZ09iamVjdC0+bV9wYWdpbmF0aW9uU3RydXQgPSBuZXdMb2dpY2FsVG9wIC0gbG9naWNhbFRv cDsKLSAgICAgICAgICAgICAgICBsb2dpY2FsVG9wID0gbmV3TG9naWNhbFRvcDsKLSAgICAgICAg ICAgICAgICBzZXRMb2dpY2FsVG9wRm9yQ2hpbGQoY2hpbGRCb3gsIGxvZ2ljYWxUb3AgKyBtYXJn aW5CZWZvcmVGb3JDaGlsZChjaGlsZEJveCkpOworICAgICAgICAgICAgaWYgKG5ld0xvZ2ljYWxU b3AgIT0gZmxvYXRMb2dpY2FsTG9jYXRpb24ueSgpKSB7CisgICAgICAgICAgICAgICAgZmxvYXRp bmdPYmplY3QtPm1fcGFnaW5hdGlvblN0cnV0ID0gbmV3TG9naWNhbFRvcCAtIGZsb2F0TG9naWNh bExvY2F0aW9uLnkoKTsKKworICAgICAgICAgICAgICAgIGZsb2F0TG9naWNhbExvY2F0aW9uID0g Y29tcHV0ZUxvZ2ljYWxMb2NhdGlvbkZvckZsb2F0KGZsb2F0aW5nT2JqZWN0LCBuZXdMb2dpY2Fs VG9wLCBsZWZ0T2Zmc2V0LCByaWdodE9mZnNldCwgZmxvYXRMb2dpY2FsV2lkdGgpOworICAgICAg ICAgICAgICAgIHNldExvZ2ljYWxMZWZ0Rm9yRmxvYXQoZmxvYXRpbmdPYmplY3QsIGZsb2F0TG9n aWNhbExvY2F0aW9uLngoKSk7CisgICAgICAgICAgICAgICAgc2V0TG9naWNhbExlZnRGb3JDaGls ZChjaGlsZEJveCwgZmxvYXRMb2dpY2FsTG9jYXRpb24ueCgpICsgY2hpbGRMb2dpY2FsTGVmdE1h cmdpbik7CisgICAgICAgICAgICAgICAgc2V0TG9naWNhbFRvcEZvckNoaWxkKGNoaWxkQm94LCBm bG9hdExvZ2ljYWxMb2NhdGlvbi55KCkgKyBtYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZEJveCkp OworICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAoY2hpbGRCbG9jaykKICAgICAgICAgICAg ICAgICAgICAgY2hpbGRCbG9jay0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBmYWxzZSk7CiAg ICAgICAgICAgICAgICAgY2hpbGRCb3gtPmxheW91dElmTmVlZGVkKCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KIAotICAgICAgICBzZXRMb2dpY2FsVG9wRm9yRmxvYXQoZmxvYXRpbmdPYmpl Y3QsIGxvZ2ljYWxUb3ApOworICAgICAgICBzZXRMb2dpY2FsVG9wRm9yRmxvYXQoZmxvYXRpbmdP YmplY3QsIGZsb2F0TG9naWNhbExvY2F0aW9uLnkoKSk7CiAgICAgICAgIHNldExvZ2ljYWxIZWln aHRGb3JGbG9hdChmbG9hdGluZ09iamVjdCwgbG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxkQm94 KSArIG1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxkQm94KSArIG1hcmdpbkFmdGVyRm9yQ2hpbGQo Y2hpbGRCb3gpKTsKIAogICAgICAgICBtX2Zsb2F0aW5nT2JqZWN0cy0+YWRkUGxhY2VkT2JqZWN0 KGZsb2F0aW5nT2JqZWN0KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5oCShyZXZpc2lvbiA5NTY3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC01NTUsNiArNTU1LDggQEAgcHJpdmF0ZToKICAgICAg ICAgICAgIHJldHVybiBjaGlsZC0+eSgpICsgY2hpbGQtPnJlbmRlcmVyKCktPm1hcmdpblRvcCgp OwogICAgIH0KIAorICAgIExheW91dFBvaW50IGNvbXB1dGVMb2dpY2FsTG9jYXRpb25Gb3JGbG9h dChGbG9hdGluZ09iamVjdCosIExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsZWZ0 T2Zmc2V0LCBMYXlvdXRVbml0IHJpZ2h0T2Zmc2V0LCBMYXlvdXRVbml0IGZsb2F0TG9naWNhbFdp ZHRoKTsKKwogICAgIC8vIFRoZSBmb2xsb3dpbmcgZnVuY3Rpb25zJyBpbXBsZW1lbnRhdGlvbnMg YXJlIGluIFJlbmRlckJsb2NrTGluZUxheW91dC5jcHAuCiAgICAgdHlwZWRlZiBzdGQ6OnBhaXI8 UmVuZGVyVGV4dCosIExhenlMaW5lQnJlYWtJdGVyYXRvcj4gTGluZUJyZWFrSXRlcmF0b3JJbmZv OwogICAgIGNsYXNzIExpbmVCcmVha2VyIHsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1Njk2KQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTEtMDktMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODU5MAorICAgICAgICAKKyAgICAg ICAgRmxvYXRzIHB1c2hlZCB0byBuZXh0IHBhZ2UsIGNvbHVtbiBvciByZWdpb24gZG9uJ3QgcmVw b3NpdGlvbiBwcm9wZXJseSBpZiB0aGUgYW1vdW50IG9mCisgICAgICAgIGF2YWlsYWJsZSBsb2dp Y2FsIHdpZHRoIGF0IHRoZSBuZXcgcG9zaXRpb24gY2hhbmdlcy4gUmVmYWN0b3IgdGhlIGNvZGUg c28gdGhhdCB3ZSBjYW4KKyAgICAgICAgcnVuIHRoZSBmbG9hdCBwbGFjZW1lbnQgYWxnb3JpdGht IGFnYWluIHdoZW4gdGhpcyBoYXBwZW5zLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZmFzdC9yZWdpb25zL3dlYmtpdC1mbG93LWZsb2F0cy1pbnNp ZGUtcmVnaW9ucy1ib3VuZHMtZXhwZWN0ZWQudHh0OgorCiAyMDExLTA5LTIxICBBYmhpc2hlayBB cnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQ2hyb21p dW0gcmViYXNlbGluZXMgZm9yIHI5NTY3MS4gICAgICAgIApJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9yZWdpb25zL3dlYmtpdC1mbG93LWZsb2F0cy1pbnNpZGUtcmVnaW9ucy1ib3VuZHMtZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy93ZWJraXQtZmxv dy1mbG9hdHMtaW5zaWRlLXJlZ2lvbnMtYm91bmRzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gOTU2 NzQpCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvd2Via2l0LWZsb3ctZmxvYXRzLWluc2lk ZS1yZWdpb25zLWJvdW5kcy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTExLDQyICsx MSwzOSBAQCBGbG93IFRocmVhZHMKICAgVGhyZWFkIHdpdGggZmxvdy1uYW1lICdmbG93MScKICAg ICBsYXllciBhdCAoMCwwKSBzaXplIDMwMHg0MDAKICAgICAgIFJlbmRlckZsb3dUaHJlYWQgYXQg KDAsMCkgc2l6ZSAzMDB4NDAwCi0gICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNp emUgMzAweDUwNQotICAgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICg1LDUpIHNpemUgMjkw eDQ5NSBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMDAwRkYpXQotICAgICAgICAgICAgUmVuZGVyQmxv Y2sge0RJVn0gYXQgKDExLDExKSBzaXplIDI2OHg0NzMgW2JvcmRlcjogKDFweCBzb2xpZCAjMDA4 MDAwKV0KKyAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSAzMDB4NDY5Cisg ICAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDUsNSkgc2l6ZSAyOTB4NDU5IFtib3JkZXI6 ICgxcHggc29saWQgIzAwMDBGRildCisgICAgICAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAo MTEsMTEpIHNpemUgMjY4eDQzNyBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMDgwMDApXQogICAgICAg ICAgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDEsMTcpIHNpemUgMjY2eDM2CiAgICAgICAgICAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMTY2eDM2CiAgICAgICAgICAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAxNjY6ICJUaGlzIGxpbmUgb2YgdGV4dCBz aG91bGQiCiAgICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxOCkgd2lkdGggMTU1OiAi bm90IGdldCBvdXQgb2YgdGhlIHJlZ2lvbi4iCi0gICAgICAgICAgICAgIFJlbmRlckJsb2NrIChm bG9hdGluZykge0RJVn0gYXQgKDk1LDg0KSBzaXplIDcyeDM3IFtib3JkZXI6ICgxcHggc29saWQg I0ZGMDAwMCldCisgICAgICAgICAgICAgIFJlbmRlckJsb2NrIChmbG9hdGluZykge0RJVn0gYXQg KDE5NSw4NCkgc2l6ZSA3MngzNyBbYm9yZGVyOiAoMXB4IHNvbGlkICNGRjAwMDApXQogICAgICAg ICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMSwxKSBzaXplIDQ0eDE4CiAgICAgICAg ICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMSwxKSB3aWR0aCA0NDogIkZsb2F0IDEiCi0gICAgICAg ICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgxLDg0KSBzaXplIDI2NngxMDgKLSAg ICAgICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAyNjZ4MTA4Cisg ICAgICAgICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgxLDg0KSBzaXplIDI2Nng5 MAorICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDI2Nng5 MAogICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTY2OiAiVGhpcyBs aW5lIG9mIHRleHQgc2hvdWxkIgotICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgp IHdpZHRoIDk0OiAibm90IGdldCBvdXQgb2YiCi0gICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwzNikgd2lkdGggOTQ6ICJ0aGUgcmVnaW9uLiIKLSAgICAgICAgICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDU0KSB3aWR0aCAyNjY6ICJUaGlzIGxpbmUgb2YgdGV4dCBzaG91bGQgbm90IGdl dCBvdXQgb2YgdGhlIgotICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsNzIpIHdpZHRo IDI2NjogInJlZ2lvbi4gVGhpcyBsaW5lIG9mIHRleHQgc2hvdWxkIG5vdCBnZXQgb3V0IgotICAg ICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsOTApIHdpZHRoIDg0OiAib2YgdGhlIHJlZ2lv bi4iCi0gICAgICAgICAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMSwyMDgpIHNpemUgMjY2eDAK LSAgICAgICAgICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgxLDIwOCkgc2l6ZSAyNjZ4MTY0Ci0g ICAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMjY2eDE2NAor ICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgpIHdpZHRoIDE5NDogIm5vdCBnZXQg b3V0IG9mIHRoZSByZWdpb24uIFRoaXMiCisgICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCwzNikgd2lkdGggMTk0OiAibGluZSBvZiB0ZXh0IHNob3VsZCBub3QgZ2V0IG91dCIKKyAgICAg ICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDU0KSB3aWR0aCAyNjY6ICJvZiB0aGUgcmVnaW9u LiBUaGlzIGxpbmUgb2YgdGV4dCBzaG91bGQgbm90IgorICAgICAgICAgICAgICAgICAgdGV4dCBy dW4gYXQgKDAsNzIpIHdpZHRoIDEzMTogImdldCBvdXQgb2YgdGhlIHJlZ2lvbi4iCisgICAgICAg ICAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMSwxOTApIHNpemUgMjY2eDAKKyAgICAgICAgICAg ICAgUmVuZGVyQmxvY2sge1B9IGF0ICgxLDE5MCkgc2l6ZSAyNjZ4MTI4CisgICAgICAgICAgICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMjY2eDEyOAogICAgICAgICAgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjY2OiAiVGhpcyBsaW5lIG9mIHRleHQgc2hv dWxkIG5vdCBnZXQgb3V0IG9mIHRoZSIKICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDE4KSB3aWR0aCAyNjY6ICJyZWdpb24uIFRoaXMgbGluZSBvZiB0ZXh0IHNob3VsZCBub3QgZ2V0 IG91dCIKICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDM2KSB3aWR0aCAyNjY6ICJv ZiB0aGUgcmVnaW9uLiBUaGlzIGxpbmUgb2YgdGV4dCBzaG91bGQgbm90IgotICAgICAgICAgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsNTYpIHdpZHRoIDg2OiAiZ2V0IG91dCBvZiB0aGUiCi0gICAg ICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCw3NCkgd2lkdGggODY6ICJyZWdpb24uIFRoaXMi Ci0gICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCw5Mikgd2lkdGggODY6ICJsaW5lIG9m IHRleHQiCi0gICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxMTApIHdpZHRoIDg2OiAi c2hvdWxkIG5vdCIKLSAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDEyOCkgd2lkdGgg ODY6ICJnZXQgb3V0IG9mIHRoZSIKLSAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE0 Nikgd2lkdGggNDQ6ICJyZWdpb24uIgotICAgICAgICAgICAgICBSZW5kZXJCbG9jayB7UH0gYXQg KDEsMzg0KSBzaXplIDI2Nng3MgotICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDg2eDcyCisgICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCw1NCkg d2lkdGggMjY2OiAiZ2V0IG91dCBvZiB0aGUgcmVnaW9uLiBUaGlzIGxpbmUgb2YgdGV4dCIKKyAg ICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDc0KSB3aWR0aCA4NjogInNob3VsZCBub3Qi CisgICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCw5Mikgd2lkdGggODY6ICJnZXQgb3V0 IG9mIHRoZSIKKyAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDExMCkgd2lkdGggNDQ6 ICJyZWdpb24uIgorICAgICAgICAgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDEsMzM0KSBzaXpl IDI2Nng4NgorICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXpl IDg2eDg2CiAgICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA4NjogIlRo aXMgbGluZSBvZiIKICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCA4 NjogInRleHQgc2hvdWxkIgotICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMzYpIHdp ZHRoIDg2OiAibm90IGdldCBvdXQgb2YiCi0gICAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCw1NCkgd2lkdGggNjc6ICJ0aGUgcmVnaW9uLiIKKyAgICAgICAgICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDUwKSB3aWR0aCA4NjogIm5vdCBnZXQgb3V0IG9mIgorICAgICAgICAgICAgICAgICAg dGV4dCBydW4gYXQgKDAsNjgpIHdpZHRoIDY3OiAidGhlIHJlZ2lvbi4iCiAgIFJlZ2lvbnMgZm9y IGZsb3cgJ2Zsb3cxJwogICAgIFJlbmRlclJlZ2lvbiB7RElWfSAjcmVnaW9uMSB3aXRoIGluZGV4 IDAKICAgICBSZW5kZXJSZWdpb24ge0RJVn0gI3JlZ2lvbjIgd2l0aCBpbmRleCAwCg==