141982 2015-02-24 13:57:41 -0800 Pass FillLayer reference instead of pointer to RenderBoxModelObject::calculateBackgroundImageGeometry. 2015-02-24 14:53:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1071779 0 zalan 2015-02-24 13:57:41 -0800 It is not supposed to be nullptr. 1071783 1 247265 zalan 2015-02-24 14:02:01 -0800 Created attachment 247265 Patch 1071797 2 247265 commit-queue 2015-02-24 14:53:26 -0800 Comment on attachment 247265 Patch Clearing flags on attachment: 247265 Committed r180586: <http://trac.webkit.org/changeset/180586> 1071798 3 commit-queue 2015-02-24 14:53:30 -0800 All reviewed patches have been landed. Closing bug. 247265 2015-02-24 14:02:01 -0800 2015-02-24 14:53:26 -0800 Patch bug-141982-20150224140149.patch text/plain 13784 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg2ZmRjMDQ2ZjJhYzY4 N2IyZmM1MmE5YTk2ZmFjYmM3YmU3MzViMS4uNzU2YWI3NjcyMTg4OTUxMzVjODYyODE5OWNiMTI3 YWE4MzQ1ZWVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTAyLTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUGFzcyBGaWxsTGF5ZXIgcmVm ZXJlbmNlIGluc3RlYWQgb2YgcG9pbnRlciB0byBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FsY3Vs YXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE5ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGVyZSBzaG91bGQgYWx3YXlzIGJlIGEgdmFsaWQgRmlsbExh eWVyLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omdl dEJhY2tncm91bmRQYWludGVkRXh0ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 bWFza0NsaXBSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6cmVwYWludExheWVy UmVjdHNGb3JJbWFnZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEZpbGxM YXllckV4dGVuZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojpj YWxjdWxhdGVGaWxsVGlsZVNpemUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxP YmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpnZXRHZW9tZXRyeUZvckJhY2tncm91bmRJbWFnZSk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0Lmg6CisKKzIwMTUtMDIt MjQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW5kZXJCb3hN b2RlbE9iamVjdDo6Y2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkgc2hvdWxkIHJldHVy biBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MTk3OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCmluZGV4IGQyMmUxNjQzYTA5MzBhNzk2N2ZjNzMyY2ZhMzkyNTczYmExZjBmYjEuLjlj ZTQ0YmQ3YmQwOTFiYWJmZDBmNGZiNWUwNDlkMTgzZDkyZDk5ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xMzQyLDcgKzEzNDIsNyBAQCBib29sIFJlbmRlckJv eDo6Z2V0QmFja2dyb3VuZFBhaW50ZWRFeHRlbnQoTGF5b3V0UmVjdCYgcGFpbnRlZEV4dGVudCkg Y29uc3QKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgQmFja2dyb3VuZEltYWdl R2VvbWV0cnkgZ2VvbWV0cnkgPSBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSgwLCBz dHlsZSgpLmJhY2tncm91bmRMYXllcnMoKSwgYmFja2dyb3VuZFJlY3QpOworICAgIEJhY2tncm91 bmRJbWFnZUdlb21ldHJ5IGdlb21ldHJ5ID0gY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0 cnkobnVsbHB0ciwgKnN0eWxlKCkuYmFja2dyb3VuZExheWVycygpLCBiYWNrZ3JvdW5kUmVjdCk7 CiAgICAgcGFpbnRlZEV4dGVudCA9IGdlb21ldHJ5LmRlc3RSZWN0KCk7CiAgICAgcmV0dXJuICFn ZW9tZXRyeS5oYXNOb25Mb2NhbEdlb21ldHJ5KCk7CiB9CkBAIC0xNTU1LDcgKzE1NTUsNyBAQCBM YXlvdXRSZWN0IFJlbmRlckJveDo6bWFza0NsaXBSZWN0KCkKICAgICBmb3IgKGNvbnN0IEZpbGxM YXllciogbWFza0xheWVyID0gc3R5bGUoKS5tYXNrTGF5ZXJzKCk7IG1hc2tMYXllcjsgbWFza0xh eWVyID0gbWFza0xheWVyLT5uZXh0KCkpIHsKICAgICAgICAgaWYgKG1hc2tMYXllci0+bWFza0lt YWdlKCkpIHsKICAgICAgICAgICAgIC8vIE1hc2tzIHNob3VsZCBuZXZlciBoYXZlIGZpeGVkIGF0 dGFjaG1lbnQsIHNvIGl0J3MgT0sgZm9yIHBhaW50Q29udGFpbmVyIHRvIGJlIG51bGwuCi0gICAg ICAgICAgICBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSBnZW9tZXRyeSA9IGNhbGN1bGF0ZUJhY2tn cm91bmRJbWFnZUdlb21ldHJ5KDAsIG1hc2tMYXllciwgYm9yZGVyQm94KTsKKyAgICAgICAgICAg IEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IGdlb21ldHJ5ID0gY2FsY3VsYXRlQmFja2dyb3VuZElt YWdlR2VvbWV0cnkobnVsbHB0ciwgKm1hc2tMYXllciwgYm9yZGVyQm94KTsKICAgICAgICAgICAg IHJlc3VsdC51bml0ZShnZW9tZXRyeS5kZXN0UmVjdCgpKTsKICAgICAgICAgfQogICAgIH0KQEAg LTE2ODEsNyArMTY4MSw3IEBAIGJvb2wgUmVuZGVyQm94OjpyZXBhaW50TGF5ZXJSZWN0c0Zvcklt YWdlKFdyYXBwZWRJbWFnZVB0ciBpbWFnZSwgY29uc3QgRmlsbExheWVyCiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRy eSBnZW9tZXRyeSA9IGxheWVyUmVuZGVyZXItPmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21l dHJ5KG51bGxwdHIsIGN1ckxheWVyLCByZW5kZXJlclJlY3QpOworICAgICAgICAgICAgQmFja2dy b3VuZEltYWdlR2VvbWV0cnkgZ2VvbWV0cnkgPSBsYXllclJlbmRlcmVyLT5jYWxjdWxhdGVCYWNr Z3JvdW5kSW1hZ2VHZW9tZXRyeShudWxscHRyLCAqY3VyTGF5ZXIsIHJlbmRlcmVyUmVjdCk7CiAg ICAgICAgICAgICBpZiAoZ2VvbWV0cnkuaGFzTm9uTG9jYWxHZW9tZXRyeSgpKSB7CiAgICAgICAg ICAgICAgICAgLy8gUmF0aGVyIHRoYW4gaW5jdXIgdGhlIGNvc3RzIG9mIGNvbXB1dGluZyB0aGUg cGFpbnRDb250YWluZXIgZm9yIHJlbmRlcmVycyB3aXRoIGZpeGVkIGJhY2tncm91bmRzCiAgICAg ICAgICAgICAgICAgLy8gaW4gb3JkZXIgdG8gZ2V0IHRoZSByaWdodCBkZXN0UmVjdCwganVzdCBy ZXBhaW50IHRoZSBlbnRpcmUgcmVuZGVyZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCBkZTRlZDI5Yjk0NTExYzI4MThmYzk1 NzY5YmUxZjdjYmQ5YjljOTNmLi44OGUyMjA1NGM4Njk3NzA0ZWEyZjcxZTljN2I5NzFhMmM1ODMx YTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHAKQEAgLTg0Miw3ICs4NDIsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpw YWludEZpbGxMYXllckV4dGVuZGVkKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjbwogCiAg ICAgLy8gbm8gcHJvZ3Jlc3NpdmUgbG9hZGluZyBvZiB0aGUgYmFja2dyb3VuZCBpbWFnZQogICAg IGlmICghYmFzZUJnQ29sb3JPbmx5ICYmIChzaG91bGRQYWludEJhY2tncm91bmRJbWFnZSB8fCBi Z0xheWVyLT5oYXNNYXNrSW1hZ2UoKSkpIHsKLSAgICAgICAgQmFja2dyb3VuZEltYWdlR2VvbWV0 cnkgZ2VvbWV0cnkgPSBjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShwYWludEluZm8u cGFpbnRDb250YWluZXIsIGJnTGF5ZXIsIHNjcm9sbGVkUGFpbnRSZWN0LCBiYWNrZ3JvdW5kT2Jq ZWN0KTsKKyAgICAgICAgQmFja2dyb3VuZEltYWdlR2VvbWV0cnkgZ2VvbWV0cnkgPSBjYWxjdWxh dGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShwYWludEluZm8ucGFpbnRDb250YWluZXIsICpiZ0xh eWVyLCBzY3JvbGxlZFBhaW50UmVjdCwgYmFja2dyb3VuZE9iamVjdCk7CiAgICAgICAgIGdlb21l dHJ5LmNsaXAoTGF5b3V0UmVjdChwaXhlbFNuYXBwZWRSZWN0KSk7CiAKICAgICAgICAgaWYgKCFn ZW9tZXRyeS5kZXN0UmVjdCgpLmlzRW1wdHkoKSkgewpAQCAtOTU5LDEwICs5NTksMTAgQEAgTGF5 b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FsY3VsYXRlSW1hZ2VJbnRyaW5zaWNEaW1l bnNpb25zKFN0eWxlSW1hZ2UqIGkKICAgICByZXR1cm4gcG9zaXRpb25pbmdBcmVhU2l6ZTsKIH0K IAotTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FsY3VsYXRlRmlsbFRpbGVTaXpl KGNvbnN0IEZpbGxMYXllciogZmlsbExheWVyLCBjb25zdCBMYXlvdXRTaXplJiBwb3NpdGlvbmlu Z0FyZWFTaXplKSBjb25zdAorTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FsY3Vs YXRlRmlsbFRpbGVTaXplKGNvbnN0IEZpbGxMYXllciYgZmlsbExheWVyLCBjb25zdCBMYXlvdXRT aXplJiBwb3NpdGlvbmluZ0FyZWFTaXplKSBjb25zdAogewotICAgIFN0eWxlSW1hZ2UqIGltYWdl ID0gZmlsbExheWVyLT5pbWFnZSgpOwotICAgIEVGaWxsU2l6ZVR5cGUgdHlwZSA9IGZpbGxMYXll ci0+c2l6ZSgpLnR5cGU7CisgICAgU3R5bGVJbWFnZSogaW1hZ2UgPSBmaWxsTGF5ZXIuaW1hZ2Uo KTsKKyAgICBFRmlsbFNpemVUeXBlIHR5cGUgPSBmaWxsTGF5ZXIuc2l6ZSgpLnR5cGU7CiAKICAg ICBMYXlvdXRTaXplIGltYWdlSW50cmluc2ljU2l6ZTsKICAgICBpZiAoaW1hZ2UpIHsKQEAgLTk3 NSw4ICs5NzUsOCBAQCBMYXlvdXRTaXplIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxhdGVG aWxsVGlsZVNpemUoY29uc3QgRmlsbExheWVyKiBmaWxsTGF5ZQogICAgICAgICBjYXNlIFNpemVM ZW5ndGg6IHsKICAgICAgICAgICAgIExheW91dFNpemUgdGlsZVNpemUgPSBwb3NpdGlvbmluZ0Fy ZWFTaXplOwogCi0gICAgICAgICAgICBMZW5ndGggbGF5ZXJXaWR0aCA9IGZpbGxMYXllci0+c2l6 ZSgpLnNpemUud2lkdGgoKTsKLSAgICAgICAgICAgIExlbmd0aCBsYXllckhlaWdodCA9IGZpbGxM YXllci0+c2l6ZSgpLnNpemUuaGVpZ2h0KCk7CisgICAgICAgICAgICBMZW5ndGggbGF5ZXJXaWR0 aCA9IGZpbGxMYXllci5zaXplKCkuc2l6ZS53aWR0aCgpOworICAgICAgICAgICAgTGVuZ3RoIGxh eWVySGVpZ2h0ID0gZmlsbExheWVyLnNpemUoKS5zaXplLmhlaWdodCgpOwogCiAgICAgICAgICAg ICBpZiAobGF5ZXJXaWR0aC5pc0ZpeGVkKCkpCiAgICAgICAgICAgICAgICAgdGlsZVNpemUuc2V0 V2lkdGgobGF5ZXJXaWR0aC52YWx1ZSgpKTsKQEAgLTExMDEsNyArMTEwMSw3IEBAIHZvaWQgUmVu ZGVyQm94TW9kZWxPYmplY3Q6OnBpeGVsU25hcEJhY2tncm91bmRJbWFnZUdlb21ldHJ5Rm9yUGFp bnRpbmcoQmFja2dyb3VuCiAgICAgZ2VvbWV0cnkuc2V0UGhhc2UoTGF5b3V0U2l6ZShwaXhlbFNu YXBwZWRQaGFzZSkpOwogfQogCi1CYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSBSZW5kZXJCb3hNb2Rl bE9iamVjdDo6Y2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkoY29uc3QgUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdCogcGFpbnRDb250YWluZXIsIGNvbnN0IEZpbGxMYXllciogZmlsbExheWVy LCBjb25zdCBMYXlvdXRSZWN0JiBwYWludFJlY3QsCitCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSBS ZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkoY29u c3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcGFpbnRDb250YWluZXIsIGNvbnN0IEZpbGxMYXll ciYgZmlsbExheWVyLCBjb25zdCBMYXlvdXRSZWN0JiBwYWludFJlY3QsCiAgICAgUmVuZGVyRWxl bWVudCogYmFja2dyb3VuZE9iamVjdCkgY29uc3QKIHsKICAgICBCYWNrZ3JvdW5kSW1hZ2VHZW9t ZXRyeSBnZW9tZXRyeTsKQEAgLTExMTEsMTkgKzExMTEsMTkgQEAgQmFja2dyb3VuZEltYWdlR2Vv bWV0cnkgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21l dHJ5KGMKICAgICAvLyBEZXRlcm1pbmUgdGhlIGJhY2tncm91bmQgcG9zaXRpb25pbmcgYXJlYSBh bmQgc2V0IGRlc3RSZWN0IHRvIHRoZSBiYWNrZ3JvdW5kIHBhaW50aW5nIGFyZWEuCiAgICAgLy8g ZGVzdFJlY3Qgd2lsbCBiZSBhZGp1c3RlZCBsYXRlciBpZiB0aGUgYmFja2dyb3VuZCBpcyBub24t cmVwZWF0aW5nLgogICAgIC8vIEZJWE1FOiB0cmFuc2Zvcm1zIHNwZWMgc2F5cyB0aGF0IGZpeGVk IGJhY2tncm91bmRzIGJlaGF2ZSBsaWtlIHNjcm9sbCBpbnNpZGUgdHJhbnNmb3Jtcy4gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njc5Ci0gICAgYm9vbCBmaXhlZEF0 dGFjaG1lbnQgPSBmaWxsTGF5ZXItPmF0dGFjaG1lbnQoKSA9PSBGaXhlZEJhY2tncm91bmRBdHRh Y2htZW50OworICAgIGJvb2wgZml4ZWRBdHRhY2htZW50ID0gZmlsbExheWVyLmF0dGFjaG1lbnQo KSA9PSBGaXhlZEJhY2tncm91bmRBdHRhY2htZW50OwogICAgIGlmICghZml4ZWRBdHRhY2htZW50 KSB7CiAgICAgICAgIGdlb21ldHJ5LnNldERlc3RSZWN0KHBhaW50UmVjdCk7CiAKICAgICAgICAg TGF5b3V0VW5pdCByaWdodCA9IDA7CiAgICAgICAgIExheW91dFVuaXQgYm90dG9tID0gMDsKICAg ICAgICAgLy8gU2Nyb2xsIGFuZCBMb2NhbC4KLSAgICAgICAgaWYgKGZpbGxMYXllci0+b3JpZ2lu KCkgIT0gQm9yZGVyRmlsbEJveCkgeworICAgICAgICBpZiAoZmlsbExheWVyLm9yaWdpbigpICE9 IEJvcmRlckZpbGxCb3gpIHsKICAgICAgICAgICAgIGxlZnQgPSBib3JkZXJMZWZ0KCk7CiAgICAg ICAgICAgICByaWdodCA9IGJvcmRlclJpZ2h0KCk7CiAgICAgICAgICAgICB0b3AgPSBib3JkZXJU b3AoKTsKICAgICAgICAgICAgIGJvdHRvbSA9IGJvcmRlckJvdHRvbSgpOwotICAgICAgICAgICAg aWYgKGZpbGxMYXllci0+b3JpZ2luKCkgPT0gQ29udGVudEZpbGxCb3gpIHsKKyAgICAgICAgICAg IGlmIChmaWxsTGF5ZXIub3JpZ2luKCkgPT0gQ29udGVudEZpbGxCb3gpIHsKICAgICAgICAgICAg ICAgICBsZWZ0ICs9IHBhZGRpbmdMZWZ0KCk7CiAgICAgICAgICAgICAgICAgcmlnaHQgKz0gcGFk ZGluZ1JpZ2h0KCk7CiAgICAgICAgICAgICAgICAgdG9wICs9IHBhZGRpbmdUb3AoKTsKQEAgLTEx NjgsMjAgKzExNjgsMjAgQEAgQmFja2dyb3VuZEltYWdlR2VvbWV0cnkgUmVuZGVyQm94TW9kZWxP YmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KGMKIAogICAgIGF1dG8gY2xp ZW50Rm9yQmFja2dyb3VuZEltYWdlID0gYmFja2dyb3VuZE9iamVjdCA/IGJhY2tncm91bmRPYmpl Y3QgOiB0aGlzOwogICAgIExheW91dFNpemUgZmlsbFRpbGVTaXplID0gY2FsY3VsYXRlRmlsbFRp bGVTaXplKGZpbGxMYXllciwgcG9zaXRpb25pbmdBcmVhU2l6ZSk7Ci0gICAgaWYgKFN0eWxlSW1h Z2UqIGxheWVySW1hZ2UgPSBmaWxsTGF5ZXItPmltYWdlKCkpCisgICAgaWYgKFN0eWxlSW1hZ2Uq IGxheWVySW1hZ2UgPSBmaWxsTGF5ZXIuaW1hZ2UoKSkKICAgICAgICAgbGF5ZXJJbWFnZS0+c2V0 Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKGNsaWVudEZvckJhY2tncm91bmRJbWFnZSwgZmlsbFRp bGVTaXplLCBzdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiAgICAgCiAgICAgZ2VvbWV0cnkuc2V0 VGlsZVNpemUoZmlsbFRpbGVTaXplKTsKIAotICAgIEVGaWxsUmVwZWF0IGJhY2tncm91bmRSZXBl YXRYID0gZmlsbExheWVyLT5yZXBlYXRYKCk7Ci0gICAgRUZpbGxSZXBlYXQgYmFja2dyb3VuZFJl cGVhdFkgPSBmaWxsTGF5ZXItPnJlcGVhdFkoKTsKKyAgICBFRmlsbFJlcGVhdCBiYWNrZ3JvdW5k UmVwZWF0WCA9IGZpbGxMYXllci5yZXBlYXRYKCk7CisgICAgRUZpbGxSZXBlYXQgYmFja2dyb3Vu ZFJlcGVhdFkgPSBmaWxsTGF5ZXIucmVwZWF0WSgpOwogICAgIExheW91dFVuaXQgYXZhaWxhYmxl V2lkdGggPSBwb3NpdGlvbmluZ0FyZWFTaXplLndpZHRoKCkgLSBnZW9tZXRyeS50aWxlU2l6ZSgp LndpZHRoKCk7CiAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVIZWlnaHQgPSBwb3NpdGlvbmluZ0Fy ZWFTaXplLmhlaWdodCgpIC0gZ2VvbWV0cnkudGlsZVNpemUoKS5oZWlnaHQoKTsKIAotICAgIExh eW91dFVuaXQgY29tcHV0ZWRYUG9zaXRpb24gPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoZmlsbExh eWVyLT54UG9zaXRpb24oKSwgYXZhaWxhYmxlV2lkdGgsIGZhbHNlKTsKKyAgICBMYXlvdXRVbml0 IGNvbXB1dGVkWFBvc2l0aW9uID0gbWluaW11bVZhbHVlRm9yTGVuZ3RoKGZpbGxMYXllci54UG9z aXRpb24oKSwgYXZhaWxhYmxlV2lkdGgsIGZhbHNlKTsKICAgICBpZiAoYmFja2dyb3VuZFJlcGVh dFggPT0gUm91bmRGaWxsICYmIHBvc2l0aW9uaW5nQXJlYVNpemUud2lkdGgoKSA+IDAgJiYgZmls bFRpbGVTaXplLndpZHRoKCkgPiAwKSB7CiAgICAgICAgIGludCBudW1UaWxlcyA9IHN0ZDo6bWF4 KDEsIHJvdW5kVG9JbnQocG9zaXRpb25pbmdBcmVhU2l6ZS53aWR0aCgpIC8gZmlsbFRpbGVTaXpl LndpZHRoKCkpKTsKLSAgICAgICAgaWYgKGZpbGxMYXllci0+c2l6ZSgpLnNpemUuaGVpZ2h0KCku aXNBdXRvKCkgJiYgYmFja2dyb3VuZFJlcGVhdFkgIT0gUm91bmRGaWxsKQorICAgICAgICBpZiAo ZmlsbExheWVyLnNpemUoKS5zaXplLmhlaWdodCgpLmlzQXV0bygpICYmIGJhY2tncm91bmRSZXBl YXRZICE9IFJvdW5kRmlsbCkKICAgICAgICAgICAgIGZpbGxUaWxlU2l6ZS5zZXRIZWlnaHQoZmls bFRpbGVTaXplLmhlaWdodCgpICogcG9zaXRpb25pbmdBcmVhU2l6ZS53aWR0aCgpIC8gKG51bVRp bGVzICogZmlsbFRpbGVTaXplLndpZHRoKCkpKTsKIAogICAgICAgICBmaWxsVGlsZVNpemUuc2V0 V2lkdGgocG9zaXRpb25pbmdBcmVhU2l6ZS53aWR0aCgpIC8gbnVtVGlsZXMpOwpAQCAtMTE5MCwx MCArMTE5MCwxMCBAQCBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeSBSZW5kZXJCb3hNb2RlbE9iamVj dDo6Y2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkoYwogICAgICAgICBnZW9tZXRyeS5z ZXRTcGFjZVNpemUoTGF5b3V0U2l6ZSgpKTsKICAgICB9CiAKLSAgICBMYXlvdXRVbml0IGNvbXB1 dGVkWVBvc2l0aW9uID0gbWluaW11bVZhbHVlRm9yTGVuZ3RoKGZpbGxMYXllci0+eVBvc2l0aW9u KCksIGF2YWlsYWJsZUhlaWdodCwgZmFsc2UpOworICAgIExheW91dFVuaXQgY29tcHV0ZWRZUG9z aXRpb24gPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoZmlsbExheWVyLnlQb3NpdGlvbigpLCBhdmFp bGFibGVIZWlnaHQsIGZhbHNlKTsKICAgICBpZiAoYmFja2dyb3VuZFJlcGVhdFkgPT0gUm91bmRG aWxsICYmIHBvc2l0aW9uaW5nQXJlYVNpemUuaGVpZ2h0KCkgPiAwICYmIGZpbGxUaWxlU2l6ZS5o ZWlnaHQoKSA+IDApIHsKICAgICAgICAgaW50IG51bVRpbGVzID0gc3RkOjptYXgoMSwgcm91bmRU b0ludChwb3NpdGlvbmluZ0FyZWFTaXplLmhlaWdodCgpIC8gZmlsbFRpbGVTaXplLmhlaWdodCgp KSk7Ci0gICAgICAgIGlmIChmaWxsTGF5ZXItPnNpemUoKS5zaXplLndpZHRoKCkuaXNBdXRvKCkg JiYgYmFja2dyb3VuZFJlcGVhdFggIT0gUm91bmRGaWxsKQorICAgICAgICBpZiAoZmlsbExheWVy LnNpemUoKS5zaXplLndpZHRoKCkuaXNBdXRvKCkgJiYgYmFja2dyb3VuZFJlcGVhdFggIT0gUm91 bmRGaWxsKQogICAgICAgICAgICAgZmlsbFRpbGVTaXplLnNldFdpZHRoKGZpbGxUaWxlU2l6ZS53 aWR0aCgpICogcG9zaXRpb25pbmdBcmVhU2l6ZS5oZWlnaHQoKSAvIChudW1UaWxlcyAqIGZpbGxU aWxlU2l6ZS5oZWlnaHQoKSkpOwogCiAgICAgICAgIGZpbGxUaWxlU2l6ZS5zZXRIZWlnaHQocG9z aXRpb25pbmdBcmVhU2l6ZS5oZWlnaHQoKSAvIG51bVRpbGVzKTsKQEAgLTEyMTcsNyArMTIxNyw3 IEBAIEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxjdWxh dGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjCiAgICAgICAgICAgICBiYWNrZ3JvdW5kUmVwZWF0 WCA9IE5vUmVwZWF0RmlsbDsKICAgICB9CiAgICAgaWYgKGJhY2tncm91bmRSZXBlYXRYID09IE5v UmVwZWF0RmlsbCkgewotICAgICAgICBMYXlvdXRVbml0IHhPZmZzZXQgPSBmaWxsTGF5ZXItPmJh Y2tncm91bmRYT3JpZ2luKCkgPT0gUmlnaHRFZGdlID8gYXZhaWxhYmxlV2lkdGggLSBjb21wdXRl ZFhQb3NpdGlvbiA6IGNvbXB1dGVkWFBvc2l0aW9uOworICAgICAgICBMYXlvdXRVbml0IHhPZmZz ZXQgPSBmaWxsTGF5ZXIuYmFja2dyb3VuZFhPcmlnaW4oKSA9PSBSaWdodEVkZ2UgPyBhdmFpbGFi bGVXaWR0aCAtIGNvbXB1dGVkWFBvc2l0aW9uIDogY29tcHV0ZWRYUG9zaXRpb247CiAgICAgICAg IGdlb21ldHJ5LnNldE5vUmVwZWF0WChsZWZ0ICsgeE9mZnNldCk7CiAgICAgICAgIGdlb21ldHJ5 LnNldFNwYWNlU2l6ZShMYXlvdXRTaXplKDAsIGdlb21ldHJ5LnNwYWNlU2l6ZSgpLmhlaWdodCgp KSk7CiAgICAgfQpAQCAtMTIzNyw3ICsxMjM3LDcgQEAgQmFja2dyb3VuZEltYWdlR2VvbWV0cnkg UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KGMK ICAgICAgICAgICAgIGJhY2tncm91bmRSZXBlYXRZID0gTm9SZXBlYXRGaWxsOwogICAgIH0KICAg ICBpZiAoYmFja2dyb3VuZFJlcGVhdFkgPT0gTm9SZXBlYXRGaWxsKSB7Ci0gICAgICAgIExheW91 dFVuaXQgeU9mZnNldCA9IGZpbGxMYXllci0+YmFja2dyb3VuZFlPcmlnaW4oKSA9PSBCb3R0b21F ZGdlID8gYXZhaWxhYmxlSGVpZ2h0IC0gY29tcHV0ZWRZUG9zaXRpb24gOiBjb21wdXRlZFlQb3Np dGlvbjsKKyAgICAgICAgTGF5b3V0VW5pdCB5T2Zmc2V0ID0gZmlsbExheWVyLmJhY2tncm91bmRZ T3JpZ2luKCkgPT0gQm90dG9tRWRnZSA/IGF2YWlsYWJsZUhlaWdodCAtIGNvbXB1dGVkWVBvc2l0 aW9uIDogY29tcHV0ZWRZUG9zaXRpb247CiAgICAgICAgIGdlb21ldHJ5LnNldE5vUmVwZWF0WSh0 b3AgKyB5T2Zmc2V0KTsKICAgICAgICAgZ2VvbWV0cnkuc2V0U3BhY2VTaXplKExheW91dFNpemUo Z2VvbWV0cnkuc3BhY2VTaXplKCkud2lkdGgoKSwgMCkpOwogICAgIH0KQEAgLTEyNTQsOSArMTI1 NCw4IEBAIEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IFJlbmRlckJveE1vZGVsT2JqZWN0OjpjYWxj dWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjCiAKIHZvaWQgUmVuZGVyQm94TW9kZWxPYmpl Y3Q6OmdldEdlb21ldHJ5Rm9yQmFja2dyb3VuZEltYWdlKGNvbnN0IFJlbmRlckxheWVyTW9kZWxP YmplY3QqIHBhaW50Q29udGFpbmVyLCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBGbG9hdFNpemUmIHBo YXNlLCBGbG9hdFNpemUmIHRpbGVTaXplKSBjb25zdAogewotICAgIGNvbnN0IEZpbGxMYXllciog YmFja2dyb3VuZExheWVyID0gc3R5bGUoKS5iYWNrZ3JvdW5kTGF5ZXJzKCk7CiAgICAgTGF5b3V0 UmVjdCBwYWludFJlY3QoZGVzdFJlY3QpOwotICAgIEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IGdl b21ldHJ5ID0gY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnkocGFpbnRDb250YWluZXIs IGJhY2tncm91bmRMYXllciwgcGFpbnRSZWN0KTsKKyAgICBCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRy eSBnZW9tZXRyeSA9IGNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KHBhaW50Q29udGFp bmVyLCAqc3R5bGUoKS5iYWNrZ3JvdW5kTGF5ZXJzKCksIHBhaW50UmVjdCk7CiAgICAgcGhhc2Ug PSBnZW9tZXRyeS5waGFzZSgpOwogICAgIHRpbGVTaXplID0gZ2VvbWV0cnkudGlsZVNpemUoKTsK ICAgICBkZXN0UmVjdCA9IGdlb21ldHJ5LmRlc3RSZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCmluZGV4IGY0YzE3YjM1NmFhNTY4MWMw YzA1NjAzNGEwNjRhYmRlN2I2ZDE0MjIuLmFjMTFmYjlkMzMyYjIwNmMwOTVhNjRhYjNjOGI2YTc3 MTIwMTUyZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5oCkBAIC0yNTgsNyArMjU4LDcgQEAgcHJvdGVjdGVkOgogICAgIExheW91dFBvaW50 IGFkanVzdGVkUG9zaXRpb25SZWxhdGl2ZVRvT2Zmc2V0UGFyZW50KGNvbnN0IExheW91dFBvaW50 JikgY29uc3Q7CiAKICAgICBib29sIGhhc0JveERlY29yYXRpb25TdHlsZSgpIGNvbnN0OwotICAg IEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IGNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5 KGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHBhaW50Q29udGFpbmVyLCBjb25zdCBGaWxs TGF5ZXIqLCBjb25zdCBMYXlvdXRSZWN0JiBwYWludFJlY3QsIFJlbmRlckVsZW1lbnQqID0gMCkg Y29uc3Q7CisgICAgQmFja2dyb3VuZEltYWdlR2VvbWV0cnkgY2FsY3VsYXRlQmFja2dyb3VuZElt YWdlR2VvbWV0cnkoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcGFpbnRDb250YWluZXIs IGNvbnN0IEZpbGxMYXllciYsIGNvbnN0IExheW91dFJlY3QmIHBhaW50UmVjdCwgUmVuZGVyRWxl bWVudCogPSAwKSBjb25zdDsKICAgICBib29sIGJvcmRlck9ic2N1cmVzQmFja2dyb3VuZEVkZ2Uo Y29uc3QgRmxvYXRTaXplJiBjb250ZXh0U2NhbGUpIGNvbnN0OwogICAgIGJvb2wgYm9yZGVyT2Jz Y3VyZXNCYWNrZ3JvdW5kKCkgY29uc3Q7CiAgICAgUm91bmRlZFJlY3QgYmFja2dyb3VuZFJvdW5k ZWRSZWN0QWRqdXN0ZWRGb3JCbGVlZEF2b2lkYW5jZShjb25zdCBHcmFwaGljc0NvbnRleHQmLCBj b25zdCBMYXlvdXRSZWN0JiwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlLCBJbmxpbmVGbG93Qm94 KiwgY29uc3QgTGF5b3V0U2l6ZSYsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkgY29uc3Q7CkBAIC0zMTMsNyArMzEzLDcgQEAgcHJpdmF0 ZToKICAgICAKICAgICB2aXJ0dWFsIExheW91dFJlY3QgZnJhbWVSZWN0Rm9yU3RpY2t5UG9zaXRp b25pbmcoKSBjb25zdCA9IDA7CiAKLSAgICBMYXlvdXRTaXplIGNhbGN1bGF0ZUZpbGxUaWxlU2l6 ZShjb25zdCBGaWxsTGF5ZXIqLCBjb25zdCBMYXlvdXRTaXplJiBzY2FsZWRQb3NpdGlvbmluZ0Fy ZWFTaXplKSBjb25zdDsKKyAgICBMYXlvdXRTaXplIGNhbGN1bGF0ZUZpbGxUaWxlU2l6ZShjb25z dCBGaWxsTGF5ZXImLCBjb25zdCBMYXlvdXRTaXplJiBzY2FsZWRQb3NpdGlvbmluZ0FyZWFTaXpl KSBjb25zdDsKIAogICAgIFJvdW5kZWRSZWN0IGdldEJhY2tncm91bmRSb3VuZGVkUmVjdChjb25z dCBMYXlvdXRSZWN0JiwgSW5saW5lRmxvd0JveCosIExheW91dFVuaXQgaW5saW5lQm94V2lkdGgs IExheW91dFVuaXQgaW5saW5lQm94SGVpZ2h0LAogICAgICAgICBib29sIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpIGNvbnN0Owo=