73854 2011-12-05 12:32:25 -0800 small refactor of RenderFlexibleBox 2011-12-05 20:59:31 -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 515296 0 tony 2011-12-05 12:32:25 -0800 small refactor of RenderFlexibleBox 515300 1 117918 tony 2011-12-05 12:34:25 -0800 Created attachment 117918 Patch 515303 2 tony 2011-12-05 12:35:07 -0800 Easy review. Makes the variable names more like the names in RenderFlexibleBox::layoutColumnReverse. 515305 3 117918 darin 2011-12-05 12:36:14 -0800 Comment on attachment 117918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117918&action=review > Source/WebCore/rendering/RenderFlexibleBox.cpp:627 > + IntPoint childLocation(shouldFlipMainAxis ? totalMainExtent - mainAxisOffset - childMainExtent : mainAxisOffset, > + crossAxisOffset + flowAwareMarginBeforeForChild(child)); WebKit formatting rules forbid this kind of lining up since it’s not renaming-infriendly. 515332 4 117928 tony 2011-12-05 13:08:29 -0800 Created attachment 117928 Patch for landing 515626 5 117928 webkit.review.bot 2011-12-05 20:59:27 -0800 Comment on attachment 117928 Patch for landing Clearing flags on attachment: 117928 Committed r102090: <http://trac.webkit.org/changeset/102090> 515627 6 webkit.review.bot 2011-12-05 20:59:31 -0800 All reviewed patches have been landed. Closing bug. 117918 2011-12-05 12:34:25 -0800 2011-12-05 13:08:26 -0800 Patch bug-73854-20111205123433.patch text/plain 5864 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE0YWY4Y2QzMjM2MDA1 ZTdiYzg1YzljMTRlODc5NGZkMWFiMzUzMi4uMmE4MTEwODM5MWE2N2MxMmVhOTljNWJjM2UzYmY5 N2JlMzUzZmViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTA1ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgc21hbGwgcmVmYWN0b3Igb2Yg UmVuZGVyRmxleGlibGVCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTczODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGEgcmVmYWN0b3IuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmlzTGVmdFRvUmlnaHRGbG93KTogSW5saW5lIGlzUmV2ZXJzZUZsb3cgc2luY2Ug aXQncyBvbmx5IHVzZWQgaW4gb25lIHBsYWNlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4pOiBSZW5hbWUgc3RhcnRFZGdlCisgICAg ICAgIHRvIG1haW5BeGlzT2Zmc2V0LiAgUmVuYW1lIGxvZ2ljYWxUb3AgdG8gY3Jvc3NBeGlzT2Zm c2V0LiAgR2V0IHJpZCBvZgorICAgICAgICBsb2dpY2FsTGVmdCBsb2NhbCB2YXJpYWJsZSBzaW5j ZSBpdCdzIGNvbmZ1c2luZy4gIE1vdmUgc2hvdWxkRmxpcE1haW5BeGlzCisgICAgICAgIG91dCBv ZiB0aGUgZm9yIGxvb3AgdG8gYXZvaWQgY29tcHV0aW5nIGl0IGVhY2ggaXRlcmF0aW9uLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorCiAyMDExLTEyLTA1ICBNaWto YWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogW0Nocm9taXVtXSBIZWFwIHByb2ZpbGVyIHNob3VsZCBkZXNpZ25hdGUgd2VhayByZWZl cmVuY2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAKaW5kZXggYjlhOGFiMjUwNjRhMWVjZDZkYmI5YTk1NzU2ZTdmM2M1NDMzMjJjOC4uYTI4MGVi NDQ0ZmNjMDcwZjVlNjUwZDEyMjQyODhlNjIyMDc5MzBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0yMDYsMTEgKzIwNiw2IEBAIGJv b2wgUmVuZGVyRmxleGlibGVCb3g6OmlzQ29sdW1uRmxvdygpIGNvbnN0CiAgICAgcmV0dXJuIHN0 eWxlKCktPmlzQ29sdW1uRmxleEZsb3coKTsKIH0KIAotYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6 aXNSZXZlcnNlRmxvdygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHN0eWxlKCktPmZsZXhGbG93KCkg PT0gRmxvd0NvbHVtblJldmVyc2UgfHwgc3R5bGUoKS0+ZmxleEZsb3coKSA9PSBGbG93Um93UmV2 ZXJzZTsKLX0KLQogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNIb3Jpem9udGFsRmxvdygpIGNv bnN0CiB7CiAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCkBAIC0yMjIsNyArMjE3 LDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNMZWZ0VG9SaWdodEZsb3coKSBjb25zdAog ewogICAgIGlmIChpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJuIHN0eWxlKCktPndyaXRp bmdNb2RlKCkgPT0gVG9wVG9Cb3R0b21Xcml0aW5nTW9kZSB8fCBzdHlsZSgpLT53cml0aW5nTW9k ZSgpID09IExlZnRUb1JpZ2h0V3JpdGluZ01vZGU7Ci0gICAgcmV0dXJuIHN0eWxlKCktPmlzTGVm dFRvUmlnaHREaXJlY3Rpb24oKSBeIGlzUmV2ZXJzZUZsb3coKTsKKyAgICByZXR1cm4gc3R5bGUo KS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpIF4gKHN0eWxlKCktPmZsZXhGbG93KCkgPT0gRmxv d1Jvd1JldmVyc2UpOwogfQogCiBMZW5ndGggUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzTGVu Z3RoRm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkgY29uc3QKQEAgLTU5OCwxMiArNTkzLDEzIEBA IHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnNldExvZ2ljYWxPdmVycmlkZVNpemUoUmVuZGVyQm94 KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsCiAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91 dEFuZFBsYWNlQ2hpbGRyZW4oRmxleE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBjb25zdCBXVEY6 OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVl U3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSkKIHsKLSAgICBMYXlvdXRVbml0 IHN0YXJ0RWRnZSA9IGZsb3dBd2FyZUJvcmRlclN0YXJ0KCkgKyBmbG93QXdhcmVQYWRkaW5nU3Rh cnQoKTsKLSAgICBzdGFydEVkZ2UgKz0gaW5pdGlhbFBhY2tpbmdPZmZzZXQoYXZhaWxhYmxlRnJl ZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0eWxlKCktPmZsZXhQYWNrKCkpOwor ICAgIExheW91dFVuaXQgbWFpbkF4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJTdGFydCgpICsg Zmxvd0F3YXJlUGFkZGluZ1N0YXJ0KCk7CisgICAgbWFpbkF4aXNPZmZzZXQgKz0gaW5pdGlhbFBh Y2tpbmdPZmZzZXQoYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHks IHN0eWxlKCktPmZsZXhQYWNrKCkpOwogCi0gICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wID0gZmxv d0F3YXJlQm9yZGVyQmVmb3JlKCkgKyBmbG93QXdhcmVQYWRkaW5nQmVmb3JlKCk7CisgICAgTGF5 b3V0VW5pdCBjcm9zc0F4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJCZWZvcmUoKSArIGZsb3dB d2FyZVBhZGRpbmdCZWZvcmUoKTsKICAgICBMYXlvdXRVbml0IHRvdGFsTWFpbkV4dGVudCA9IG1h aW5BeGlzRXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXhBc2NlbnQgPSAwLCBtYXhEZXNjZW50 ID0gMDsgLy8gVXNlZCB3aGVuIGZsZXgtYWxpZ246IGJhc2VsaW5lLgorICAgIGJvb2wgc2hvdWxk RmxpcE1haW5BeGlzID0gIWlzQ29sdW1uRmxvdygpICYmICFpc0xlZnRUb1JpZ2h0RmxvdygpOwog ICAgIHNpemVfdCBpID0gMDsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5m aXJzdCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCksICsraSkgewogICAgICAgICBM YXlvdXRVbml0IGNoaWxkUHJlZmVycmVkU2l6ZSA9IGNoaWxkU2l6ZXNbaV0gKyBtYWluQXhpc0Jv cmRlckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCk7CkBAIC02MjQsMjAgKzYyMCwyMCBA QCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKEZsZXhPcmRl ckl0ZXJhdG9yJiBpdGVyYXRvciwgY29ucwogICAgICAgICB9IGVsc2UgaWYgKGNyb3NzQXhpc0xl bmd0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgc2V0Q3Jvc3NBeGlzRXh0ZW50KHN0ZDo6bWF4 KGNyb3NzQXhpc0V4dGVudCgpLCBjcm9zc0F4aXNCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgKyBj cm9zc0F4aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBjcm9zc0F4aXNFeHRlbnRGb3JD aGlsZChjaGlsZCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCkpKTsKIAotICAgICAgICBzdGFy dEVkZ2UgKz0gZmxvd0F3YXJlTWFyZ2luU3RhcnRGb3JDaGlsZChjaGlsZCk7CisgICAgICAgIG1h aW5BeGlzT2Zmc2V0ICs9IGZsb3dBd2FyZU1hcmdpblN0YXJ0Rm9yQ2hpbGQoY2hpbGQpOwogCiAg ICAgICAgIExheW91dFVuaXQgY2hpbGRNYWluRXh0ZW50ID0gbWFpbkF4aXNFeHRlbnRGb3JDaGls ZChjaGlsZCk7Ci0gICAgICAgIGJvb2wgc2hvdWxkRmxpcE1haW5BeGlzID0gIWlzQ29sdW1uRmxv dygpICYmICFpc0xlZnRUb1JpZ2h0RmxvdygpOwotICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0ID0gc2hvdWxkRmxpcE1haW5BeGlzID8gdG90YWxNYWluRXh0ZW50IC0gc3RhcnRFZGdlIC0g Y2hpbGRNYWluRXh0ZW50IDogc3RhcnRFZGdlOworICAgICAgICBJbnRQb2ludCBjaGlsZExvY2F0 aW9uKHNob3VsZEZsaXBNYWluQXhpcyA/IHRvdGFsTWFpbkV4dGVudCAtIG1haW5BeGlzT2Zmc2V0 IC0gY2hpbGRNYWluRXh0ZW50IDogbWFpbkF4aXNPZmZzZXQsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY3Jvc3NBeGlzT2Zmc2V0ICsgZmxvd0F3YXJlTWFyZ2luQmVmb3JlRm9yQ2hp bGQoY2hpbGQpKTsKIAogICAgICAgICAvLyBGSVhNRTogU3VwcG9ydGluZyBsYXlvdXQgZGVsdGFz LgotICAgICAgICBzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNoaWxkLCBJbnRQb2ludChs b2dpY2FsTGVmdCwgbG9naWNhbFRvcCArIGZsb3dBd2FyZU1hcmdpbkJlZm9yZUZvckNoaWxkKGNo aWxkKSkpOwotICAgICAgICBzdGFydEVkZ2UgKz0gY2hpbGRNYWluRXh0ZW50ICsgZmxvd0F3YXJl TWFyZ2luRW5kRm9yQ2hpbGQoY2hpbGQpOworICAgICAgICBzZXRGbG93QXdhcmVMb2NhdGlvbkZv ckNoaWxkKGNoaWxkLCBjaGlsZExvY2F0aW9uKTsKKyAgICAgICAgbWFpbkF4aXNPZmZzZXQgKz0g Y2hpbGRNYWluRXh0ZW50ICsgZmxvd0F3YXJlTWFyZ2luRW5kRm9yQ2hpbGQoY2hpbGQpOwogCi0g ICAgICAgIHN0YXJ0RWRnZSArPSBwYWNraW5nU3BhY2VCZXR3ZWVuQ2hpbGRyZW4oYXZhaWxhYmxl RnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0eWxlKCktPmZsZXhQYWNrKCks IGNoaWxkU2l6ZXMuc2l6ZSgpKTsKKyAgICAgICAgbWFpbkF4aXNPZmZzZXQgKz0gcGFja2luZ1Nw YWNlQmV0d2VlbkNoaWxkcmVuKGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhp YmlsaXR5LCBzdHlsZSgpLT5mbGV4UGFjaygpLCBjaGlsZFNpemVzLnNpemUoKSk7CiAKICAgICAg ICAgaWYgKGlzQ29sdW1uRmxvdygpKQotICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChzdGFy dEVkZ2UpOworICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChtYWluQXhpc09mZnNldCk7CiAg ICAgfQogCiAgICAgaWYgKHN0eWxlKCktPmZsZXhGbG93KCkgPT0gRmxvd0NvbHVtblJldmVyc2Up IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXgg YWFjODQ3MGUyODhiZTEwNTI4ODFhMmVjYTA2NDk3NTU2ZTdkMDVmNC4uZmUwZGZhMjFlYzMxZjJk ZWE3ZDE1Yzk1MDZiN2ZjNTE5NDgzYWI1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTUzLDcgKzUzLDYgQEAgcHJpdmF0ZToKIAogICAgIGJv b2wgaGFzT3J0aG9nb25hbEZsb3coUmVuZGVyQm94KiBjaGlsZCkgY29uc3Q7CiAgICAgYm9vbCBp c0NvbHVtbkZsb3coKSBjb25zdDsKLSAgICBib29sIGlzUmV2ZXJzZUZsb3coKSBjb25zdDsKICAg ICBib29sIGlzSG9yaXpvbnRhbEZsb3coKSBjb25zdDsKICAgICBib29sIGlzTGVmdFRvUmlnaHRG bG93KCkgY29uc3Q7CiAgICAgTGVuZ3RoIGNyb3NzQXhpc0xlbmd0aCgpIGNvbnN0Owo= 117928 2011-12-05 13:08:29 -0800 2011-12-05 20:59:27 -0800 Patch for landing bug-73854-20111205130837.patch text/plain 5842 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE0YWY4Y2QzMjM2MDA1 ZTdiYzg1YzljMTRlODc5NGZkMWFiMzUzMi4uODMyZjYyZTgyZGY4YTAxMjQ5NmUyNTNlNjMwOTI2 ZGM5ZWNhZmMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTA1ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgc21hbGwgcmVmYWN0b3Igb2Yg UmVuZGVyRmxleGlibGVCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTczODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGEgcmVmYWN0b3IuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmlzTGVmdFRvUmlnaHRGbG93KTogSW5saW5lIGlzUmV2ZXJzZUZsb3cgc2luY2UgaXQn cyBvbmx5IHVzZWQgaW4gb25lIHBsYWNlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4pOiBSZW5hbWUgc3RhcnRFZGdlCisgICAgICAg IHRvIG1haW5BeGlzT2Zmc2V0LiAgUmVuYW1lIGxvZ2ljYWxUb3AgdG8gY3Jvc3NBeGlzT2Zmc2V0 LiAgR2V0IHJpZCBvZgorICAgICAgICBsb2dpY2FsTGVmdCBsb2NhbCB2YXJpYWJsZSBzaW5jZSBp dCdzIGNvbmZ1c2luZy4gIE1vdmUgc2hvdWxkRmxpcE1haW5BeGlzCisgICAgICAgIG91dCBvZiB0 aGUgZm9yIGxvb3AgdG8gYXZvaWQgY29tcHV0aW5nIGl0IGVhY2ggaXRlcmF0aW9uLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorCiAyMDExLTEyLTA1ICBNaWtoYWls IE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogW0Nocm9taXVtXSBIZWFwIHByb2ZpbGVyIHNob3VsZCBkZXNpZ25hdGUgd2VhayByZWZlcmVu Y2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK aW5kZXggYjlhOGFiMjUwNjRhMWVjZDZkYmI5YTk1NzU2ZTdmM2M1NDMzMjJjOC4uODhjNzdkODQ5 YjVkNjY0M2U5NjdmYmRjMTQ4M2UzMTQ4OWMzNDc4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0yMDYsMTEgKzIwNiw2IEBAIGJvb2wg UmVuZGVyRmxleGlibGVCb3g6OmlzQ29sdW1uRmxvdygpIGNvbnN0CiAgICAgcmV0dXJuIHN0eWxl KCktPmlzQ29sdW1uRmxleEZsb3coKTsKIH0KIAotYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNS ZXZlcnNlRmxvdygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHN0eWxlKCktPmZsZXhGbG93KCkgPT0g Rmxvd0NvbHVtblJldmVyc2UgfHwgc3R5bGUoKS0+ZmxleEZsb3coKSA9PSBGbG93Um93UmV2ZXJz ZTsKLX0KLQogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNIb3Jpem9udGFsRmxvdygpIGNvbnN0 CiB7CiAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCkBAIC0yMjIsNyArMjE3LDcg QEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNMZWZ0VG9SaWdodEZsb3coKSBjb25zdAogewog ICAgIGlmIChpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJuIHN0eWxlKCktPndyaXRpbmdN b2RlKCkgPT0gVG9wVG9Cb3R0b21Xcml0aW5nTW9kZSB8fCBzdHlsZSgpLT53cml0aW5nTW9kZSgp ID09IExlZnRUb1JpZ2h0V3JpdGluZ01vZGU7Ci0gICAgcmV0dXJuIHN0eWxlKCktPmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSBeIGlzUmV2ZXJzZUZsb3coKTsKKyAgICByZXR1cm4gc3R5bGUoKS0+ aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpIF4gKHN0eWxlKCktPmZsZXhGbG93KCkgPT0gRmxvd1Jv d1JldmVyc2UpOwogfQogCiBMZW5ndGggUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzTGVuZ3Ro Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkgY29uc3QKQEAgLTU5OCwxMiArNTkzLDEzIEBAIHZv aWQgUmVuZGVyRmxleGlibGVCb3g6OnNldExvZ2ljYWxPdmVycmlkZVNpemUoUmVuZGVyQm94KiBj aGlsZCwgTGF5b3V0VW5pdCBjaGlsCiAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFu ZFBsYWNlQ2hpbGRyZW4oRmxleE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBjb25zdCBXVEY6OlZl Y3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3Bh Y2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSkKIHsKLSAgICBMYXlvdXRVbml0IHN0 YXJ0RWRnZSA9IGZsb3dBd2FyZUJvcmRlclN0YXJ0KCkgKyBmbG93QXdhcmVQYWRkaW5nU3RhcnQo KTsKLSAgICBzdGFydEVkZ2UgKz0gaW5pdGlhbFBhY2tpbmdPZmZzZXQoYXZhaWxhYmxlRnJlZVNw YWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0eWxlKCktPmZsZXhQYWNrKCkpOworICAg IExheW91dFVuaXQgbWFpbkF4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJTdGFydCgpICsgZmxv d0F3YXJlUGFkZGluZ1N0YXJ0KCk7CisgICAgbWFpbkF4aXNPZmZzZXQgKz0gaW5pdGlhbFBhY2tp bmdPZmZzZXQoYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0 eWxlKCktPmZsZXhQYWNrKCkpOwogCi0gICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wID0gZmxvd0F3 YXJlQm9yZGVyQmVmb3JlKCkgKyBmbG93QXdhcmVQYWRkaW5nQmVmb3JlKCk7CisgICAgTGF5b3V0 VW5pdCBjcm9zc0F4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJCZWZvcmUoKSArIGZsb3dBd2Fy ZVBhZGRpbmdCZWZvcmUoKTsKICAgICBMYXlvdXRVbml0IHRvdGFsTWFpbkV4dGVudCA9IG1haW5B eGlzRXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBtYXhBc2NlbnQgPSAwLCBtYXhEZXNjZW50ID0g MDsgLy8gVXNlZCB3aGVuIGZsZXgtYWxpZ246IGJhc2VsaW5lLgorICAgIGJvb2wgc2hvdWxkRmxp cE1haW5BeGlzID0gIWlzQ29sdW1uRmxvdygpICYmICFpc0xlZnRUb1JpZ2h0RmxvdygpOwogICAg IHNpemVfdCBpID0gMDsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJz dCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCksICsraSkgewogICAgICAgICBMYXlv dXRVbml0IGNoaWxkUHJlZmVycmVkU2l6ZSA9IGNoaWxkU2l6ZXNbaV0gKyBtYWluQXhpc0JvcmRl ckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCk7CkBAIC02MjQsMjAgKzYyMCwyMCBAQCB2 b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKEZsZXhPcmRlckl0 ZXJhdG9yJiBpdGVyYXRvciwgY29ucwogICAgICAgICB9IGVsc2UgaWYgKGNyb3NzQXhpc0xlbmd0 aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgc2V0Q3Jvc3NBeGlzRXh0ZW50KHN0ZDo6bWF4KGNy b3NzQXhpc0V4dGVudCgpLCBjcm9zc0F4aXNCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgKyBjcm9z c0F4aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBjcm9zc0F4aXNFeHRlbnRGb3JDaGls ZChjaGlsZCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCkpKTsKIAotICAgICAgICBzdGFydEVk Z2UgKz0gZmxvd0F3YXJlTWFyZ2luU3RhcnRGb3JDaGlsZChjaGlsZCk7CisgICAgICAgIG1haW5B eGlzT2Zmc2V0ICs9IGZsb3dBd2FyZU1hcmdpblN0YXJ0Rm9yQ2hpbGQoY2hpbGQpOwogCiAgICAg ICAgIExheW91dFVuaXQgY2hpbGRNYWluRXh0ZW50ID0gbWFpbkF4aXNFeHRlbnRGb3JDaGlsZChj aGlsZCk7Ci0gICAgICAgIGJvb2wgc2hvdWxkRmxpcE1haW5BeGlzID0gIWlzQ29sdW1uRmxvdygp ICYmICFpc0xlZnRUb1JpZ2h0RmxvdygpOwotICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0 ID0gc2hvdWxkRmxpcE1haW5BeGlzID8gdG90YWxNYWluRXh0ZW50IC0gc3RhcnRFZGdlIC0gY2hp bGRNYWluRXh0ZW50IDogc3RhcnRFZGdlOworICAgICAgICBJbnRQb2ludCBjaGlsZExvY2F0aW9u KHNob3VsZEZsaXBNYWluQXhpcyA/IHRvdGFsTWFpbkV4dGVudCAtIG1haW5BeGlzT2Zmc2V0IC0g Y2hpbGRNYWluRXh0ZW50IDogbWFpbkF4aXNPZmZzZXQsCisgICAgICAgICAgICBjcm9zc0F4aXNP ZmZzZXQgKyBmbG93QXdhcmVNYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCkpOwogCiAgICAgICAg IC8vIEZJWE1FOiBTdXBwb3J0aW5nIGxheW91dCBkZWx0YXMuCi0gICAgICAgIHNldEZsb3dBd2Fy ZUxvY2F0aW9uRm9yQ2hpbGQoY2hpbGQsIEludFBvaW50KGxvZ2ljYWxMZWZ0LCBsb2dpY2FsVG9w ICsgZmxvd0F3YXJlTWFyZ2luQmVmb3JlRm9yQ2hpbGQoY2hpbGQpKSk7Ci0gICAgICAgIHN0YXJ0 RWRnZSArPSBjaGlsZE1haW5FeHRlbnQgKyBmbG93QXdhcmVNYXJnaW5FbmRGb3JDaGlsZChjaGls ZCk7CisgICAgICAgIHNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoY2hpbGQsIGNoaWxkTG9j YXRpb24pOworICAgICAgICBtYWluQXhpc09mZnNldCArPSBjaGlsZE1haW5FeHRlbnQgKyBmbG93 QXdhcmVNYXJnaW5FbmRGb3JDaGlsZChjaGlsZCk7CiAKLSAgICAgICAgc3RhcnRFZGdlICs9IHBh Y2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRp dmVGbGV4aWJpbGl0eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5zaXplKCkpOwor ICAgICAgICBtYWluQXhpc09mZnNldCArPSBwYWNraW5nU3BhY2VCZXR3ZWVuQ2hpbGRyZW4oYXZh aWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0eWxlKCktPmZsZXhQ YWNrKCksIGNoaWxkU2l6ZXMuc2l6ZSgpKTsKIAogICAgICAgICBpZiAoaXNDb2x1bW5GbG93KCkp Ci0gICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KHN0YXJ0RWRnZSk7CisgICAgICAgICAgICBz ZXRMb2dpY2FsSGVpZ2h0KG1haW5BeGlzT2Zmc2V0KTsKICAgICB9CiAKICAgICBpZiAoc3R5bGUo KS0+ZmxleEZsb3coKSA9PSBGbG93Q29sdW1uUmV2ZXJzZSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCBhYWM4NDcwZTI4OGJlMTA1Mjg4MWEy ZWNhMDY0OTc1NTZlN2QwNWY0Li5mZTBkZmEyMWVjMzFmMmRlYTdkMTVjOTUwNmI3ZmM1MTk0ODNh YjU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApA QCAtNTMsNyArNTMsNiBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBoYXNPcnRob2dvbmFsRmxvdyhS ZW5kZXJCb3gqIGNoaWxkKSBjb25zdDsKICAgICBib29sIGlzQ29sdW1uRmxvdygpIGNvbnN0Owot ICAgIGJvb2wgaXNSZXZlcnNlRmxvdygpIGNvbnN0OwogICAgIGJvb2wgaXNIb3Jpem9udGFsRmxv dygpIGNvbnN0OwogICAgIGJvb2wgaXNMZWZ0VG9SaWdodEZsb3coKSBjb25zdDsKICAgICBMZW5n dGggY3Jvc3NBeGlzTGVuZ3RoKCkgY29uc3Q7Cg==