157914 2016-05-19 12:54:51 -0700 Cleanup RenderObject::container() 2016-05-19 16:53:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cdumez commit-queue esprehn+autocc glenn hyatt kondapallykalyan mmaxfield simon.fraser oldest_to_newest 1194885 0 zalan 2016-05-19 12:54:51 -0700 Use existing helper functions like canContainAbsolutelyPositionedObjects()/canContainFixedPositionedObjects() and update stale comments. 1194887 1 279417 zalan 2016-05-19 13:01:53 -0700 Created attachment 279417 Patch 1194889 2 279417 hyatt 2016-05-19 13:07:22 -0700 Comment on attachment 279417 Patch r=me 1195043 3 279417 commit-queue 2016-05-19 16:53:31 -0700 Comment on attachment 279417 Patch Clearing flags on attachment: 279417 Committed r201201: <http://trac.webkit.org/changeset/201201> 1195044 4 commit-queue 2016-05-19 16:53:36 -0700 All reviewed patches have been landed. Closing bug. 279417 2016-05-19 13:01:53 -0700 2016-05-19 16:53:31 -0700 Patch bug-157914-20160519130253.patch text/plain 11215 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2OTEyYTc4MGFjMTg5 MTFiYjVjMDVkOTRiYzcxNjY4YzNjZjQzNS4uYWJkMDBhYzdhZmRhNDZhMjU5NmJjMjE4ZWJmNjZi MmU4YWFkNjhjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE2LTA1LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJPYmpl Y3Q6OmNvbnRhaW5lcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTc5MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAxLiBOb3cgd2UgaGF2ZSBhIGRlZGljYXRlZCBtZXRob2QgZm9yIHRoZSBvcHRpb25h bCwgcmVwYWludENvbnRhaW5lclNraXBwZWQgYnJhbmNoLiBUaGUgY29udGFpbmVyIGZpbmRpbmcK KyAgICAgICAgbG9naWMgaXMgbW92ZWQgdG8gYSBzdGF0aWMgaW5saW5lIGZ1bmN0aW9uIHNvIHRo ZSBjb21waWxlciBjYW4gb3B0aW1pemUgb3V0IHRoZSByZXBhaW50Q29udGFpbmVyU2tpcHBlZCBi cmFuY2hlcywgd2hlbgorICAgICAgICBjb250YWluZXIoKSBpcyBjYWxsZWQgaW5zdGVhZCBvZiBj b250YWluZXIocmVwYWludENvbnRhaW5lciwgaXNSZXBhaW50Q29udGFpbmVyU2tpcHBlZCkuCisg ICAgICAgIDIuIFVzZSBoZWxwZXIgZnVuY3Rpb25zIGxpa2UgY2FuQ29udGFpbkFic29sdXRlbHlQ b3NpdGlvbmVkT2JqZWN0cygpCisgICAgICAgIDMuIFJlbW92ZSBzdGFsZSBjb21tZW50cy4KKwor ICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om1hcExvY2FsVG9Db250YWlu ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwdXNoTWFwcGluZ1RvQ29udGFpbmVy KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlcklubGluZTo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlcklubGluZTo6bWFwTG9jYWxUb0NvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJJbmxpbmU6OnB1c2hNYXBwaW5nVG9Db250YWluZXIpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udGFpbmVyRm9yRWxlbWVu dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbnRhaW5lcik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0Lmg6CisKIDIwMTYtMDUtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIHdlYmF1ZGlvIGNyYXNoIG9uIEFSTSBwbGF0Zm9y bXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggYzJmMDFkZjdmMTVk OTVjZTI5YmE3MmI2NTRlNzRmOTVjYmIwZmUwNC4uNDBjOWZlMTFmYWM0NmEyZGZjNzVjZWY3Yzc3 YWFlMWNmOTExODE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAg LTIwMDQsNyArMjAwNCw3IEBAIHZvaWQgUmVuZGVyQm94OjptYXBMb2NhbFRvQ29udGFpbmVyKGNv bnN0IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluCiAgICAgfQogCiAgICAg Ym9vbCBjb250YWluZXJTa2lwcGVkOwotICAgIFJlbmRlckVsZW1lbnQqIGNvbnRhaW5lciA9IHRo aXMtPmNvbnRhaW5lcihyZXBhaW50Q29udGFpbmVyLCAmY29udGFpbmVyU2tpcHBlZCk7CisgICAg UmVuZGVyRWxlbWVudCogY29udGFpbmVyID0gdGhpcy0+Y29udGFpbmVyKHJlcGFpbnRDb250YWlu ZXIsIGNvbnRhaW5lclNraXBwZWQpOwogICAgIGlmICghY29udGFpbmVyKQogICAgICAgICByZXR1 cm47CiAKQEAgLTIwNTIsNyArMjA1Miw3IEBAIGNvbnN0IFJlbmRlck9iamVjdCogUmVuZGVyQm94 OjpwdXNoTWFwcGluZ1RvQ29udGFpbmVyKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmplCiAgICAg QVNTRVJUKGFuY2VzdG9yVG9TdG9wQXQgIT0gdGhpcyk7CiAKICAgICBib29sIGFuY2VzdG9yU2tp cHBlZDsKLSAgICBSZW5kZXJFbGVtZW50KiBjb250YWluZXIgPSB0aGlzLT5jb250YWluZXIoYW5j ZXN0b3JUb1N0b3BBdCwgJmFuY2VzdG9yU2tpcHBlZCk7CisgICAgUmVuZGVyRWxlbWVudCogY29u dGFpbmVyID0gdGhpcy0+Y29udGFpbmVyKGFuY2VzdG9yVG9TdG9wQXQsIGFuY2VzdG9yU2tpcHBl ZCk7CiAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC0y MjQxLDcgKzIyNDEsNyBAQCBMYXlvdXRSZWN0IFJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JSZXBh aW50KGNvbnN0IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IFJlbmRlcgogICAgIH0KIAogICAgIGJv b2wgY29udGFpbmVyU2tpcHBlZDsKLSAgICBhdXRvKiByZW5kZXJlciA9IGNvbnRhaW5lcihyZXBh aW50Q29udGFpbmVyLCAmY29udGFpbmVyU2tpcHBlZCk7CisgICAgYXV0byogcmVuZGVyZXIgPSBj b250YWluZXIocmVwYWludENvbnRhaW5lciwgY29udGFpbmVyU2tpcHBlZCk7CiAgICAgaWYgKCFy ZW5kZXJlcikKICAgICAgICAgcmV0dXJuIGFkanVzdGVkUmVjdDsKICAgICAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5kZXggZGRiN2EzMDdjOWZlN2E3N2JiMjJl ZWMxMDQxNmE5NTIwZjc1Mjk4ZC4uZDJmY2JlNGE0OGFlZWY3NGU1YTdlYWM4YmNhMmU2YzkwMmFh ZjNjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTEy NzgsNyArMTI3OCw3IEBAIExheW91dFJlY3QgUmVuZGVySW5saW5lOjpjb21wdXRlUmVjdEZvclJl cGFpbnQoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgY29uc3QgUmVuCiAgICAgICAgIHJldHVybiBh ZGp1c3RlZFJlY3Q7CiAKICAgICBib29sIGNvbnRhaW5lclNraXBwZWQ7Ci0gICAgUmVuZGVyRWxl bWVudCogY29udGFpbmVyID0gdGhpcy0+Y29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsICZjb250 YWluZXJTa2lwcGVkKTsKKyAgICBSZW5kZXJFbGVtZW50KiBjb250YWluZXIgPSB0aGlzLT5jb250 YWluZXIocmVwYWludENvbnRhaW5lciwgY29udGFpbmVyU2tpcHBlZCk7CiAgICAgaWYgKCFjb250 YWluZXIpCiAgICAgICAgIHJldHVybiBhZGp1c3RlZFJlY3Q7CiAKQEAgLTEzNDIsNyArMTM0Miw3 IEBAIHZvaWQgUmVuZGVySW5saW5lOjptYXBMb2NhbFRvQ29udGFpbmVyKGNvbnN0IFJlbmRlckxh eWVyTW9kZWxPYmplY3QqIHJlcGFpbnRDb250CiAgICAgfQogCiAgICAgYm9vbCBjb250YWluZXJT a2lwcGVkOwotICAgIFJlbmRlckVsZW1lbnQqIGNvbnRhaW5lciA9IHRoaXMtPmNvbnRhaW5lcihy ZXBhaW50Q29udGFpbmVyLCAmY29udGFpbmVyU2tpcHBlZCk7CisgICAgUmVuZGVyRWxlbWVudCog Y29udGFpbmVyID0gdGhpcy0+Y29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsIGNvbnRhaW5lclNr aXBwZWQpOwogICAgIGlmICghY29udGFpbmVyKQogICAgICAgICByZXR1cm47CiAKQEAgLTEzODAs NyArMTM4MCw3IEBAIGNvbnN0IFJlbmRlck9iamVjdCogUmVuZGVySW5saW5lOjpwdXNoTWFwcGlu Z1RvQ29udGFpbmVyKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPCiAgICAgQVNTRVJUKGFuY2VzdG9y VG9TdG9wQXQgIT0gdGhpcyk7CiAKICAgICBib29sIGFuY2VzdG9yU2tpcHBlZDsKLSAgICBSZW5k ZXJFbGVtZW50KiBjb250YWluZXIgPSB0aGlzLT5jb250YWluZXIoYW5jZXN0b3JUb1N0b3BBdCwg JmFuY2VzdG9yU2tpcHBlZCk7CisgICAgUmVuZGVyRWxlbWVudCogY29udGFpbmVyID0gdGhpcy0+ Y29udGFpbmVyKGFuY2VzdG9yVG9TdG9wQXQsIGFuY2VzdG9yU2tpcHBlZCk7CiAgICAgaWYgKCFj b250YWluZXIpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDcxMTBjNTFiOTY5ZTU4MWIyYTc1YmE5NThjZTZk ZmQ3OTZlMmRlY2EuLjUzNzVhOTdhNzlkOGEyOGYxMmUxYTIxN2MzYWE1Y2JiNDY0OTQ1ZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xNDU3LDY5ICsx NDU3LDM0IEBAIGJvb2wgUmVuZGVyT2JqZWN0OjpoYXNFbnRpcmVseUZpeGVkQmFja2dyb3VuZCgp IGNvbnN0CiAgICAgcmV0dXJuIHN0eWxlKCkuaGFzRW50aXJlbHlGaXhlZEJhY2tncm91bmQoKTsK IH0KIAotUmVuZGVyRWxlbWVudCogUmVuZGVyT2JqZWN0Ojpjb250YWluZXIoY29uc3QgUmVuZGVy TGF5ZXJNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgYm9vbCogcmVwYWludENvbnRhaW5l clNraXBwZWQpIGNvbnN0CitzdGF0aWMgaW5saW5lIFJlbmRlckVsZW1lbnQqIGNvbnRhaW5lckZv ckVsZW1lbnQoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyTGF5ZXJN b2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgYm9vbCogcmVwYWludENvbnRhaW5lclNraXBw ZWQpCiB7Ci0gICAgaWYgKHJlcGFpbnRDb250YWluZXJTa2lwcGVkKQotICAgICAgICAqcmVwYWlu dENvbnRhaW5lclNraXBwZWQgPSBmYWxzZTsKLQogICAgIC8vIFRoaXMgbWV0aG9kIGlzIGV4dHJl bWVseSBzaW1pbGFyIHRvIGNvbnRhaW5pbmdCbG9jaygpLCBidXQgd2l0aCBhIGZldyBub3RhYmxl CiAgICAgLy8gZXhjZXB0aW9ucy4KLSAgICAvLyAoMSkgSXQgY2FuIGJlIHVzZWQgb24gb3JwaGFu ZWQgc3VidHJlZXMsIGkuZS4sIGl0IGNhbiBiZSBjYWxsZWQgc2FmZWx5IGV2ZW4gd2hlbgotICAg IC8vIHRoZSBvYmplY3QgaXMgbm90IHBhcnQgb2YgdGhlIHByaW1hcnkgZG9jdW1lbnQgc3VidHJl ZSB5ZXQuCi0gICAgLy8gKDIpIEZvciBub3JtYWwgZmxvdyBlbGVtZW50cywgaXQganVzdCByZXR1 cm5zIHRoZSBwYXJlbnQuCi0gICAgLy8gKDMpIEZvciBhYnNvbHV0ZSBwb3NpdGlvbmVkIGVsZW1l bnRzLCBpdCB3aWxsIHJldHVybiBhIHJlbGF0aXZlIHBvc2l0aW9uZWQgaW5saW5lLgotICAgIC8v IGNvbnRhaW5pbmdCbG9jaygpIHNpbXBseSBza2lwcyByZWxwb3NpdGlvbmVkIGlubGluZXMgYW5k IGxldHMgYW4gZW5jbG9zaW5nIGJsb2NrIGhhbmRsZQotICAgIC8vIHRoZSBsYXlvdXQgb2YgdGhl IHBvc2l0aW9uZWQgb2JqZWN0LiAgVGhpcyBkb2VzIG1lYW4gdGhhdCBjb21wdXRlUG9zaXRpb25l ZExvZ2ljYWxXaWR0aCBhbmQKLSAgICAvLyBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQg aGF2ZSB0byB1c2UgY29udGFpbmVyKCkuCi0gICAgYXV0byBvID0gcGFyZW50KCk7Ci0KLSAgICBp ZiAoaXNUZXh0KCkpCi0gICAgICAgIHJldHVybiBvOwotCi0gICAgRVBvc2l0aW9uIHBvcyA9IHN0 eWxlKCkucG9zaXRpb24oKTsKLSAgICBpZiAocG9zID09IEZpeGVkUG9zaXRpb24pIHsKLSAgICAg ICAgLy8gY29udGFpbmVyKCkgY2FuIGJlIGNhbGxlZCBvbiBhbiBvYmplY3QgdGhhdCBpcyBub3Qg aW4gdGhlCi0gICAgICAgIC8vIHRyZWUgeWV0LiAgV2UgZG9uJ3QgY2FsbCB2aWV3KCkgc2luY2Ug aXQgd2lsbCBhc3NlcnQgaWYgaXQKLSAgICAgICAgLy8gY2FuJ3QgZ2V0IGJhY2sgdG8gdGhlIGNh bnZhcy4gIEluc3RlYWQgd2UganVzdCB3YWxrIGFzIGhpZ2ggdXAKLSAgICAgICAgLy8gYXMgd2Ug Y2FuLiAgSWYgd2UncmUgaW4gdGhlIHRyZWUsIHdlJ2xsIGdldCB0aGUgcm9vdC4gIElmIHdlCi0g ICAgICAgIC8vIGFyZW4ndCB3ZSdsbCBnZXQgdGhlIHJvb3Qgb2Ygb3VyIGxpdHRsZSBzdWJ0cmVl IChtb3N0IGxpa2VseQotICAgICAgICAvLyB3ZSdsbCBqdXN0IHJldHVybiBudWxscHRyKS4KLSAg ICAgICAgLy8gRklYTUU6IFRoZSBkZWZpbml0aW9uIG9mIHZpZXcoKSBoYXMgY2hhbmdlZCB0byBu b3QgY3Jhd2wgdXAgdGhlIHJlbmRlciB0cmVlLiAgSXQgbWlnaHQKLSAgICAgICAgLy8gYmUgc2Fm ZSBub3cgdG8gdXNlIGl0LgotICAgICAgICAvLyBGSVhNRTogc2hhcmUgY29kZSB3aXRoIGNvbnRh aW5pbmdCbG9ja0ZvckZpeGVkUG9zaXRpb24oKS4KLSAgICAgICAgd2hpbGUgKG8gJiYgby0+cGFy ZW50KCkgJiYgIShvLT5oYXNUcmFuc2Zvcm0oKSAmJiBvLT5pc1JlbmRlckJsb2NrKCkpKSB7Ci0g ICAgICAgICAgICAvLyBmb3JlaWduT2JqZWN0IGlzIHRoZSBjb250YWluaW5nIGJsb2NrIGZvciBp dHMgY29udGVudHMuCi0gICAgICAgICAgICBpZiAoby0+aXNTVkdGb3JlaWduT2JqZWN0KCkpCi0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgIC8vIFRoZSByZW5kZXIgZmxvdyB0 aHJlYWQgaXMgdGhlIHRvcCBtb3N0IGNvbnRhaW5pbmcgYmxvY2sKLSAgICAgICAgICAgIC8vIGZv ciB0aGUgZml4ZWQgcG9zaXRpb25lZCBlbGVtZW50cy4KLSAgICAgICAgICAgIGlmIChvLT5pc091 dE9mRmxvd1JlbmRlckZsb3dUaHJlYWQoKSkKLSAgICAgICAgICAgICAgICBicmVhazsKLQotICAg ICAgICAgICAgaWYgKHJlcGFpbnRDb250YWluZXJTa2lwcGVkICYmIG8gPT0gcmVwYWludENvbnRh aW5lcikKLSAgICAgICAgICAgICAgICAqcmVwYWludENvbnRhaW5lclNraXBwZWQgPSB0cnVlOwot Ci0gICAgICAgICAgICBvID0gby0+cGFyZW50KCk7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgaWYg KHBvcyA9PSBBYnNvbHV0ZVBvc2l0aW9uKSB7Ci0gICAgICAgIC8vIFNhbWUgZ29lcyBoZXJlLiAg V2UgdGVjaG5pY2FsbHkganVzdCB3YW50IG91ciBjb250YWluaW5nIGJsb2NrLCBidXQKLSAgICAg ICAgLy8gd2UgbWF5IG5vdCBoYXZlIG9uZSBpZiB3ZSdyZSBwYXJ0IG9mIGFuIHVuaW5zdGFsbGVk IHN1YnRyZWUuICBXZSdsbAotICAgICAgICAvLyBjbGltYiBhcyBoaWdoIGFzIHdlIGNhbiB0aG91 Z2guCi0gICAgICAgIC8vIEZJWE1FOiBzaGFyZSBjb2RlIHdpdGggaXNDb250YWluaW5nQmxvY2tD YW5kaWRhdGVGb3JBYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdCgpLgotICAgICAgICAvLyBGSVhN RTogaGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkgaW5jbHVkZXMgcHJlc2VydmVzM0QoKSBj aGVjaywgYnV0IHRoaXMgbWF5IG5lZWQgdG8gY2hhbmdlOiBodHRwczovL3d3dy53My5vcmcvQnVn cy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTI3NTY2Ci0gICAgICAgIHdoaWxlIChvICYmIG8tPnN0 eWxlKCkucG9zaXRpb24oKSA9PSBTdGF0aWNQb3NpdGlvbiAmJiAhby0+aXNSZW5kZXJWaWV3KCkg JiYgIShvLT5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKSAmJiBvLT5pc1JlbmRlckJsb2Nr KCkpKSB7Ci0gICAgICAgICAgICBpZiAoby0+aXNTVkdGb3JlaWduT2JqZWN0KCkpIC8vIGZvcmVp Z25PYmplY3QgaXMgdGhlIGNvbnRhaW5pbmcgYmxvY2sgZm9yIGNvbnRlbnRzIGluc2lkZSBpdAot ICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICBpZiAocmVwYWludENvbnRhaW5l clNraXBwZWQgJiYgbyA9PSByZXBhaW50Q29udGFpbmVyKQotICAgICAgICAgICAgICAgICpyZXBh aW50Q29udGFpbmVyU2tpcHBlZCA9IHRydWU7Ci0KLSAgICAgICAgICAgIG8gPSBvLT5wYXJlbnQo KTsKLSAgICAgICAgfQorICAgIC8vICgxKSBGb3Igbm9ybWFsIGZsb3cgZWxlbWVudHMsIGl0IGp1 c3QgcmV0dXJucyB0aGUgcGFyZW50LgorICAgIC8vICgyKSBGb3IgYWJzb2x1dGUgcG9zaXRpb25l ZCBlbGVtZW50cywgaXQgd2lsbCByZXR1cm4gYSByZWxhdGl2ZSBwb3NpdGlvbmVkIGlubGluZSwg d2hpbGUKKyAgICAvLyBjb250YWluaW5nQmxvY2soKSBza2lwcyB0byB0aGUgbm9uLWFub255bW91 cyBjb250YWluaW5nIGJsb2NrLgorICAgIC8vIFRoaXMgZG9lcyBtZWFuIHRoYXQgY29tcHV0ZVBv c2l0aW9uZWRMb2dpY2FsV2lkdGggYW5kIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodCBo YXZlIHRvIHVzZSBjb250YWluZXIoKS4KKyAgICBFUG9zaXRpb24gcG9zID0gcmVuZGVyZXIuc3R5 bGUoKS5wb3NpdGlvbigpOworICAgIGF1dG8qIHBhcmVudCA9IHJlbmRlcmVyLnBhcmVudCgpOwor ICAgIGlmIChpczxSZW5kZXJUZXh0PihyZW5kZXJlcikgfHwgKHBvcyAhPSBGaXhlZFBvc2l0aW9u ICYmIHBvcyAhPSBBYnNvbHV0ZVBvc2l0aW9uKSkKKyAgICAgICAgcmV0dXJuIHBhcmVudDsKKyAg ICBmb3IgKDsgcGFyZW50ICYmIChwb3MgPT0gQWJzb2x1dGVQb3NpdGlvbiA/ICFwYXJlbnQtPmNh bkNvbnRhaW5BYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdHMoKSA6ICFwYXJlbnQtPmNhbkNvbnRh aW5GaXhlZFBvc2l0aW9uT2JqZWN0cygpKTsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnQoKSkgewor ICAgICAgICBpZiAocmVwYWludENvbnRhaW5lclNraXBwZWQgJiYgcmVwYWludENvbnRhaW5lciA9 PSBwYXJlbnQpCisgICAgICAgICAgICAqcmVwYWludENvbnRhaW5lclNraXBwZWQgPSB0cnVlOwog ICAgIH0KKyAgICByZXR1cm4gcGFyZW50OworfQogCi0gICAgcmV0dXJuIG87CitSZW5kZXJFbGVt ZW50KiBSZW5kZXJPYmplY3Q6OmNvbnRhaW5lcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbnRh aW5lckZvckVsZW1lbnQoKnRoaXMsIG51bGxwdHIsIG51bGxwdHIpOworfQorCitSZW5kZXJFbGVt ZW50KiBSZW5kZXJPYmplY3Q6OmNvbnRhaW5lcihjb25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0 KiByZXBhaW50Q29udGFpbmVyLCBib29sJiByZXBhaW50Q29udGFpbmVyU2tpcHBlZCkgY29uc3QK K3sKKyAgICByZXBhaW50Q29udGFpbmVyU2tpcHBlZCA9IGZhbHNlOworICAgIHJldHVybiBjb250 YWluZXJGb3JFbGVtZW50KCp0aGlzLCByZXBhaW50Q29udGFpbmVyLCAmcmVwYWludENvbnRhaW5l clNraXBwZWQpOwogfQogCiBib29sIFJlbmRlck9iamVjdDo6aXNTZWxlY3Rpb25Cb3JkZXIoKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGE2MDE3MGJh NTc4N2M0MGQ0MTgxOWZlMmMwNGM0MjRhMjMxMzVlMmUuLmJkODE4MTVkN2ZmMGNmYzA3OTkyNGRm M2ZjZGY1NTA3NDIwNzc4MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgKQEAgLTU3NSw3ICs1NzUsOCBAQCBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyB0aGUgb2JqZWN0 IGNvbnRhaW5pbmcgdGhpcyBvbmUuIENhbiBiZSBkaWZmZXJlbnQgZnJvbSBwYXJlbnQgZm9yIHBv c2l0aW9uZWQgZWxlbWVudHMuCiAgICAgLy8gSWYgcmVwYWludENvbnRhaW5lciBhbmQgcmVwYWlu dENvbnRhaW5lclNraXBwZWQgYXJlIG5vdCBudWxsLCBvbiByZXR1cm4gKnJlcGFpbnRDb250YWlu ZXJTa2lwcGVkCiAgICAgLy8gaXMgdHJ1ZSBpZiB0aGUgcmVuZGVyZXIgcmV0dXJuZWQgaXMgYW4g YW5jZXN0b3Igb2YgcmVwYWludENvbnRhaW5lci4KLSAgICBSZW5kZXJFbGVtZW50KiBjb250YWlu ZXIoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciA9IG51bGxw dHIsIGJvb2wqIHJlcGFpbnRDb250YWluZXJTa2lwcGVkID0gbnVsbHB0cikgY29uc3Q7CisgICAg UmVuZGVyRWxlbWVudCogY29udGFpbmVyKCkgY29uc3Q7CisgICAgUmVuZGVyRWxlbWVudCogY29u dGFpbmVyKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsIGJv b2wmIHJlcGFpbnRDb250YWluZXJTa2lwcGVkKSBjb25zdDsKIAogICAgIFJlbmRlckJveE1vZGVs T2JqZWN0KiBvZmZzZXRQYXJlbnQoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0LmgKaW5kZXggNTI3MjhmZmE5NmU3ZmI5MDdkMTg4MmE0M2U0ZjM2MDFjM2NhNTkzZS4u YmFjYzVjMjUzYWMzZTdjOTVkNWM2ZmE5ZjM2MTc1NTI0NDVhODk1MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dC5oCkBAIC0yMDUsNiArMjA1LDggQEAgcHJpdmF0ZToKICAgICBM YXlvdXRSZWN0IGNvbGxlY3RTZWxlY3Rpb25SZWN0c0ZvckxpbmVCb3hlcyhjb25zdCBSZW5kZXJM YXllck1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBib29sIGNsaXBUb1Zpc2libGVDb250 ZW50LCBWZWN0b3I8TGF5b3V0UmVjdD4qKTsKIAogICAgIHZvaWQgbm9kZSgpIGNvbnN0ID0gZGVs ZXRlOworICAgIHZvaWQgY29udGFpbmVyKCkgY29uc3QgPSBkZWxldGU7IC8vIFVzZSBwYXJlbnQo KSBpbnN0ZWFkLgorICAgIHZvaWQgY29udGFpbmVyKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmpl Y3QmLCBib29sJikgY29uc3QgPSBkZWxldGU7IC8vIFVzZSBwYXJlbnQoKSBpbnN0ZWFkLgogCiAg ICAgLy8gV2UgcHV0IHRoZSBiaXRmaWVsZCBmaXJzdCB0byBtaW5pbWl6ZSBwYWRkaW5nIG9uIDY0 LWJpdC4KICAgICB1bnNpZ25lZCBtX2hhc0JyZWFrYWJsZUNoYXIgOiAxOyAvLyBXaGV0aGVyIG9y IG5vdCB3ZSBjYW4gYmUgYnJva2VuIGludG8gbXVsdGlwbGUgbGluZXMuCg==