159798 2016-07-14 18:25:45 -0700 [iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first 2016-07-14 18:47:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 1211287 0 simon.fraser 2016-07-14 18:25:45 -0700 [iOS WK2] When scrolling apple.com/music on iPad Pro in landscape, left-hand tiles appear first 1211288 1 283725 simon.fraser 2016-07-14 18:28:03 -0700 Created attachment 283725 Patch 1211289 2 simon.fraser 2016-07-14 18:28:19 -0700 rdar://problem/27362717 1211290 3 simon.fraser 2016-07-14 18:28:47 -0700 I considered returning Optional<std::pair<TileIndex, TileIndex>> but decided that it would be too ugly at call sites. 1211303 4 simon.fraser 2016-07-14 18:47:37 -0700 https://trac.webkit.org/r203261 283725 2016-07-14 18:28:03 -0700 2016-07-14 18:31:34 -0700 Patch bug-159798-20160714182716.patch text/plain 13086 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWJhNmIzMGFmOTg0ZTll YTAxNWEyMmNkMGJiOGVkMjE4MjNhYzUxOS4uN2U5OWQ2Njg1YWRiOGI0MjEyZmM1MTUxN2MzMjcz OTIyNDA0YTg4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE2LTA3LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBX aGVuIHNjcm9sbGluZyBhcHBsZS5jb20vbXVzaWMgb24gaVBhZCBQcm8gaW4gbGFuZHNjYXBlLCBs ZWZ0LWhhbmQgdGlsZXMgYXBwZWFyIGZpcnN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk3OTgKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjczNjI3 MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBv dXQtb2YtdmlzaWJsZSB0aWxlZCBsYXllcnMsIHdlIGFsd2F5cyBhbGxvY2F0ZWQgdGhlIHRvcC1s ZWZ0IHRpbGUsIHdhc3RpbmcKKyAgICAgICAgbWVtb3J5IGFuZCBjYXVzaW5nIHVnbGluZXNzIHdo ZW4gc2Nyb2xsaW5nIHRoYXQgbGF5ZXIgaW50byB2aWV3LiBUaGlzIGhhcHBlbmVkCisgICAgICAg IGJlY2F1c2UgZ2V0VGlsZUluZGV4UmFuZ2VGb3JSZWN0KCkgaGFkIG5vIHdheSB0byBleHByZXNz IHRoZSBmYWN0IHRoYXQgbm8gdGlsZXMKKyAgICAgICAgc2hvdWxkIGJlIGNyZWF0ZWQuCisKKyAg ICAgICAgRml4IGdldFRpbGVJbmRleFJhbmdlRm9yUmVjdCgpIHRvIHJldHVybiBhIGJvb2wsIGFu ZCBmaXggY2FsbGVycyB0byByZXNwZWN0IHRoZQorICAgICAgICByZXR1cm4gdmFsdWUuCisKKyAg ICAgICAgVGVzdDogY29tcG9zaXRpbmcvdGlsaW5nL29mZnNjcmVlbi10aWxlZC1sYXllci5odG1s CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpkdW1wQWRkaXRpb25hbFByb3BlcnRp ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRpbGVHcmlkOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QpOgorICAgICAgICAo V2ViQ29yZTo6VGlsZUdyaWQ6OnRpbGVzV291bGRDaGFuZ2VGb3JDb3ZlcmFnZVJlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6VGlsZUdyaWQ6OmdldFRpbGVJbmRleFJhbmdlRm9yUmVjdCk6CisgICAg ICAgIChXZWJDb3JlOjpUaWxlR3JpZDo6cmV2YWxpZGF0ZVRpbGVzKToKKyAgICAgICAgKFdlYkNv cmU6OlRpbGVHcmlkOjplbnN1cmVUaWxlc0ZvclJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6VGls ZUdyaWQ6OmV4dGVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvVGlsZUdyaWQu aDoKKwogMjAxNi0wNy0xMSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAg ICAgUkVHUkVTU0lPTiAoMjAyNjk0KTogQXVkaW8gYW5kIFZpZGVvIHBsYXliYWNrIGNvbnRyb2xz OiBDYW5ub3QgZmluZCBhIHBvc2l0aW9uIHNsaWRlciB0byBhZGp1c3QgcGxheWJhY2sgcG9zaXRp b24gdXNpbmcgVk8uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAppbmRleCAxMGM4YzcyZTU1MTIyNzk1MGFkZGZhZDUy NDM4Njc3MmRlMWI1YzI1Li42MGI1NDU3ZDQyZjQ1OGE3NWQzY2ZmZWQ1ZmYzZTY0OTU3Yzc2YzI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5jcHAKQEAgLTM0OTYsNyArMzQ5Niw3IEBAIHZvaWQgR3JhcGhpY3NMYXll ckNBOjpkdW1wQWRkaXRpb25hbFByb3BlcnRpZXMoVGV4dFN0cmVhbSYgdGV4dFN0cmVhbSwgaW50 IGluZGVuCiAKICAgICBpZiAoYmVoYXZpb3IgJiBMYXllclRyZWVBc1RleHREZWJ1ZykgewogICAg ICAgICB3cml0ZUluZGVudCh0ZXh0U3RyZWFtLCBpbmRlbnQgKyAxKTsKLSAgICAgICAgdGV4dFN0 cmVhbSA8PCAiKGFjY2VsZXJhdGV0ZXMgZHJhd2luZyAiIDw8IG1fYWNjZWxlcmF0ZXNEcmF3aW5n IDw8ICIpXG4iOworICAgICAgICB0ZXh0U3RyZWFtIDw8ICIoYWNjZWxlcmF0ZXMgZHJhd2luZyAi IDw8IG1fYWNjZWxlcmF0ZXNEcmF3aW5nIDw8ICIpXG4iOwogICAgICAgICB3cml0ZUluZGVudCh0 ZXh0U3RyZWFtLCBpbmRlbnQgKyAxKTsKICAgICAgICAgdGV4dFN0cmVhbSA8PCAiKHVzZXMgZGlz cGxheS1saXN0IGRyYXdpbmcgIiA8PCBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgPDwgIilcbiI7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev VGlsZUdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvVGlsZUdy aWQuY3BwCmluZGV4IDMyMmE3MDU0YTgyN2I0ZTE2ODY1ZTFhOThiODlhOWU3ZDhjZTkwNTEuLmI5 YzAyY2NmNmUwMDJhYzZjNTM1NmVlZTk3YzRlMmQyNGE5ZDI4NTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9UaWxlR3JpZC5jcHAKQEAgLTExMiwxNSArMTEy LDE1IEBAIHZvaWQgVGlsZUdyaWQ6OnNldE5lZWRzRGlzcGxheUluUmVjdChjb25zdCBJbnRSZWN0 JiByZWN0KQogICAgIGlmIChyZXBhaW50UmVjdEluVGlsZUNvb3Jkcy5oZWlnaHQoKSA8IDIgKiB0 aWxlU2l6ZS5oZWlnaHQoKSAmJiByZXBhaW50UmVjdEluVGlsZUNvb3Jkcy53aWR0aCgpIDwgMiAq IHRpbGVTaXplLndpZHRoKCkpIHsKICAgICAgICAgVGlsZUluZGV4IHRvcExlZnQ7CiAgICAgICAg IFRpbGVJbmRleCBib3R0b21SaWdodDsKLSAgICAgICAgZ2V0VGlsZUluZGV4UmFuZ2VGb3JSZWN0 KHJlcGFpbnRSZWN0SW5UaWxlQ29vcmRzLCB0b3BMZWZ0LCBib3R0b21SaWdodCk7Ci0KLSAgICAg ICAgZm9yIChpbnQgeSA9IHRvcExlZnQueSgpOyB5IDw9IGJvdHRvbVJpZ2h0LnkoKTsgKyt5KSB7 Ci0gICAgICAgICAgICBmb3IgKGludCB4ID0gdG9wTGVmdC54KCk7IHggPD0gYm90dG9tUmlnaHQu eCgpOyArK3gpIHsKLSAgICAgICAgICAgICAgICBUaWxlSW5kZXggdGlsZUluZGV4KHgsIHkpOwot ICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIFRpbGVNYXA6Oml0ZXJhdG9yIGl0ID0g bV90aWxlcy5maW5kKHRpbGVJbmRleCk7Ci0gICAgICAgICAgICAgICAgaWYgKGl0ICE9IG1fdGls ZXMuZW5kKCkpCi0gICAgICAgICAgICAgICAgICAgIHNldFRpbGVOZWVkc0Rpc3BsYXlJblJlY3Qo dGlsZUluZGV4LCBpdC0+dmFsdWUsIHJlcGFpbnRSZWN0SW5UaWxlQ29vcmRzLCBtX3ByaW1hcnlU aWxlQ292ZXJhZ2VSZWN0KTsKKyAgICAgICAgaWYgKGdldFRpbGVJbmRleFJhbmdlRm9yUmVjdChy ZXBhaW50UmVjdEluVGlsZUNvb3JkcywgdG9wTGVmdCwgYm90dG9tUmlnaHQpKSB7CisgICAgICAg ICAgICBmb3IgKGludCB5ID0gdG9wTGVmdC55KCk7IHkgPD0gYm90dG9tUmlnaHQueSgpOyArK3kp IHsKKyAgICAgICAgICAgICAgICBmb3IgKGludCB4ID0gdG9wTGVmdC54KCk7IHggPD0gYm90dG9t UmlnaHQueCgpOyArK3gpIHsKKyAgICAgICAgICAgICAgICAgICAgVGlsZUluZGV4IHRpbGVJbmRl eCh4LCB5KTsKKyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgICAgIFRpbGVN YXA6Oml0ZXJhdG9yIGl0ID0gbV90aWxlcy5maW5kKHRpbGVJbmRleCk7CisgICAgICAgICAgICAg ICAgICAgIGlmIChpdCAhPSBtX3RpbGVzLmVuZCgpKQorICAgICAgICAgICAgICAgICAgICAgICAg c2V0VGlsZU5lZWRzRGlzcGxheUluUmVjdCh0aWxlSW5kZXgsIGl0LT52YWx1ZSwgcmVwYWludFJl Y3RJblRpbGVDb29yZHMsIG1fcHJpbWFyeVRpbGVDb3ZlcmFnZVJlY3QpOworICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICByZXR1cm47CkBAIC0xOTks MTIgKzE5OSwxNCBAQCBib29sIFRpbGVHcmlkOjp0aWxlc1dvdWxkQ2hhbmdlRm9yQ292ZXJhZ2VS ZWN0KGNvbnN0IEZsb2F0UmVjdCYgY292ZXJhZ2VSZWN0KSBjbwogICAgIHNjYWxlZFJlY3Quc2Nh bGUobV9zY2FsZSk7CiAgICAgSW50UmVjdCBjdXJyZW50Q292ZXJhZ2VSZWN0SW5UaWxlQ29vcmRz KGVuY2xvc2luZ0ludFJlY3Qoc2NhbGVkUmVjdCkpOwogCisgICAgSW50UmVjdCB0aWxlQ292ZXJh Z2VSZWN0OwogICAgIFRpbGVJbmRleCB0b3BMZWZ0OwogICAgIFRpbGVJbmRleCBib3R0b21SaWdo dDsKLSAgICBnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QoY3VycmVudENvdmVyYWdlUmVjdEluVGls ZUNvb3JkcywgdG9wTGVmdCwgYm90dG9tUmlnaHQpOworICAgIGlmIChnZXRUaWxlSW5kZXhSYW5n ZUZvclJlY3QoY3VycmVudENvdmVyYWdlUmVjdEluVGlsZUNvb3JkcywgdG9wTGVmdCwgYm90dG9t UmlnaHQpKSB7CisgICAgICAgIHRpbGVDb3ZlcmFnZVJlY3QgPSByZWN0Rm9yVGlsZUluZGV4KHRv cExlZnQpOworICAgICAgICB0aWxlQ292ZXJhZ2VSZWN0LnVuaXRlKHJlY3RGb3JUaWxlSW5kZXgo Ym90dG9tUmlnaHQpKTsKKyAgICB9CiAKLSAgICBJbnRSZWN0IHRpbGVDb3ZlcmFnZVJlY3QgPSBy ZWN0Rm9yVGlsZUluZGV4KHRvcExlZnQpOwotICAgIHRpbGVDb3ZlcmFnZVJlY3QudW5pdGUocmVj dEZvclRpbGVJbmRleChib3R0b21SaWdodCkpOwogICAgIHJldHVybiB0aWxlQ292ZXJhZ2VSZWN0 ICE9IG1fcHJpbWFyeVRpbGVDb3ZlcmFnZVJlY3Q7CiB9CiAKQEAgLTIzMSwxMSArMjMzLDE0IEBA IEludFJlY3QgVGlsZUdyaWQ6OnJlY3RGb3JUaWxlSW5kZXgoY29uc3QgVGlsZUluZGV4JiB0aWxl SW5kZXgpIGNvbnN0CiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKLXZvaWQgVGlsZUdyaWQ6OmdldFRp bGVJbmRleFJhbmdlRm9yUmVjdChjb25zdCBJbnRSZWN0JiByZWN0LCBUaWxlSW5kZXgmIHRvcExl ZnQsIFRpbGVJbmRleCYgYm90dG9tUmlnaHQpIGNvbnN0Citib29sIFRpbGVHcmlkOjpnZXRUaWxl SW5kZXhSYW5nZUZvclJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgVGlsZUluZGV4JiB0b3BMZWZ0 LCBUaWxlSW5kZXgmIGJvdHRvbVJpZ2h0KSBjb25zdAogewogICAgIEludFJlY3QgY2xhbXBlZFJl Y3QgPSBtX2NvbnRyb2xsZXIuYm91bmRzKCk7CiAgICAgY2xhbXBlZFJlY3Quc2NhbGUobV9zY2Fs ZSk7CiAgICAgY2xhbXBlZFJlY3QuaW50ZXJzZWN0KHJlY3QpOworICAgIAorICAgIGlmIChjbGFt cGVkUmVjdC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gdGls ZVNpemUgPSBtX3RpbGVTaXplOwogICAgIGlmIChjbGFtcGVkUmVjdC54KCkgPj0gMCkKQEAgLTI1 Myw2ICsyNTgsOCBAQCB2b2lkIFRpbGVHcmlkOjpnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QoY29u c3QgSW50UmVjdCYgcmVjdCwgVGlsZUluZGV4JiB0b3BMZWZ0LAogCiAgICAgaW50IGJvdHRvbVlS YXRpbyA9IGNlaWwoKGZsb2F0KWNsYW1wZWRSZWN0Lm1heFkoKSAvIHRpbGVTaXplLmhlaWdodCgp KTsKICAgICBib3R0b21SaWdodC5zZXRZKHN0ZDo6bWF4KGJvdHRvbVlSYXRpbyAtIDEsIDApKTsK KyAgICAKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdW5zaWduZWQgVGlsZUdyaWQ6OmJsYW5rUGl4 ZWxDb3VudCgpIGNvbnN0CkBAIC0zNDgsNiArMzU1LDcgQEAgdm9pZCBUaWxlR3JpZDo6cmV2YWxp ZGF0ZVRpbGVzKFRpbGVWYWxpZGF0aW9uUG9saWN5IHZhbGlkYXRpb25Qb2xpY3kpCiAKICAgICAg ICAgUGxhdGZvcm1DQUxheWVyKiB0aWxlTGF5ZXIgPSB0aWxlSW5mby5sYXllci5nZXQoKTsKICAg ICAgICAgSW50UmVjdCB0aWxlUmVjdCA9IHJlY3RGb3JUaWxlSW5kZXgodGlsZUluZGV4KTsKKwog ICAgICAgICBpZiAodGlsZVJlY3QuaW50ZXJzZWN0cyhjb3ZlcmFnZVJlY3RJblRpbGVDb29yZHMp KSB7CiAgICAgICAgICAgICB0aWxlSW5mby5jb2hvcnQgPSBWaXNpYmxlVGlsZUNvaG9ydDsKICAg ICAgICAgICAgIGlmICh0aWxlSW5mby5oYXNTdGFsZUNvbnRlbnQpIHsKQEAgLTQ0NCwxNCArNDUy LDE0IEBAIHZvaWQgVGlsZUdyaWQ6OnJldmFsaWRhdGVUaWxlcyhUaWxlVmFsaWRhdGlvblBvbGlj eSB2YWxpZGF0aW9uUG9saWN5KQogCiAgICAgICAgIFRpbGVJbmRleCB0b3BMZWZ0Rm9yQm91bmRz OwogICAgICAgICBUaWxlSW5kZXggYm90dG9tUmlnaHRGb3JCb3VuZHM7Ci0gICAgICAgIGdldFRp bGVJbmRleFJhbmdlRm9yUmVjdChib3VuZHNJblRpbGVDb29yZHMsIHRvcExlZnRGb3JCb3VuZHMs IGJvdHRvbVJpZ2h0Rm9yQm91bmRzKTsKLQotICAgICAgICBWZWN0b3I8VGlsZUluZGV4PiB0aWxl c1RvUmVtb3ZlOwotICAgICAgICBmb3IgKGF1dG8mIGluZGV4IDogbV90aWxlcy5rZXlzKCkpIHsK LSAgICAgICAgICAgIGlmIChpbmRleC55KCkgPCB0b3BMZWZ0Rm9yQm91bmRzLnkoKSB8fCBpbmRl eC55KCkgPiBib3R0b21SaWdodEZvckJvdW5kcy55KCkgfHwgaW5kZXgueCgpIDwgdG9wTGVmdEZv ckJvdW5kcy54KCkgfHwgaW5kZXgueCgpID4gYm90dG9tUmlnaHRGb3JCb3VuZHMueCgpKQotICAg ICAgICAgICAgICAgIHRpbGVzVG9SZW1vdmUuYXBwZW5kKGluZGV4KTsKKyAgICAgICAgaWYgKGdl dFRpbGVJbmRleFJhbmdlRm9yUmVjdChib3VuZHNJblRpbGVDb29yZHMsIHRvcExlZnRGb3JCb3Vu ZHMsIGJvdHRvbVJpZ2h0Rm9yQm91bmRzKSkgeworICAgICAgICAgICAgVmVjdG9yPFRpbGVJbmRl eD4gdGlsZXNUb1JlbW92ZTsKKyAgICAgICAgICAgIGZvciAoYXV0byYgaW5kZXggOiBtX3RpbGVz LmtleXMoKSkgeworICAgICAgICAgICAgICAgIGlmIChpbmRleC55KCkgPCB0b3BMZWZ0Rm9yQm91 bmRzLnkoKSB8fCBpbmRleC55KCkgPiBib3R0b21SaWdodEZvckJvdW5kcy55KCkgfHwgaW5kZXgu eCgpIDwgdG9wTGVmdEZvckJvdW5kcy54KCkgfHwgaW5kZXgueCgpID4gYm90dG9tUmlnaHRGb3JC b3VuZHMueCgpKQorICAgICAgICAgICAgICAgICAgICB0aWxlc1RvUmVtb3ZlLmFwcGVuZChpbmRl eCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZW1vdmVUaWxlcyh0aWxlc1RvUmVtb3Zl KTsKICAgICAgICAgfQotICAgICAgICByZW1vdmVUaWxlcyh0aWxlc1RvUmVtb3ZlKTsKICAgICB9 CiAKICAgICBtX2NvbnRyb2xsZXIuZGlkUmV2YWxpZGF0ZVRpbGVzKCk7CkBAIC01MjYsNyArNTM0 LDggQEAgSW50UmVjdCBUaWxlR3JpZDo6ZW5zdXJlVGlsZXNGb3JSZWN0KGNvbnN0IEZsb2F0UmVj dCYgcmVjdCwgQ292ZXJhZ2VUeXBlIG5ld1RpbGUKIAogICAgIFRpbGVJbmRleCB0b3BMZWZ0Owog ICAgIFRpbGVJbmRleCBib3R0b21SaWdodDsKLSAgICBnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3Qo cmVjdEluVGlsZUNvb3JkcywgdG9wTGVmdCwgYm90dG9tUmlnaHQpOworICAgIGlmICghZ2V0VGls ZUluZGV4UmFuZ2VGb3JSZWN0KHJlY3RJblRpbGVDb29yZHMsIHRvcExlZnQsIGJvdHRvbVJpZ2h0 KSkKKyAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKIAogICAgIFRpbGVDb2hvcnQgY3VyckNvaG9y dCA9IG5leHRUaWxlQ29ob3J0KCk7CiAgICAgdW5zaWduZWQgdGlsZXNJbkNvaG9ydCA9IDA7CkBA IC01ODEsMTAgKzU5MCwxMiBAQCBJbnRSZWN0IFRpbGVHcmlkOjpleHRlbnQoKSBjb25zdAogewog ICAgIFRpbGVJbmRleCB0b3BMZWZ0OwogICAgIFRpbGVJbmRleCBib3R0b21SaWdodDsKLSAgICBn ZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QobV9wcmltYXJ5VGlsZUNvdmVyYWdlUmVjdCwgdG9wTGVm dCwgYm90dG9tUmlnaHQpOworICAgIGlmIChnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QobV9wcmlt YXJ5VGlsZUNvdmVyYWdlUmVjdCwgdG9wTGVmdCwgYm90dG9tUmlnaHQpKSB7CisgICAgICAgIC8v IFJldHVybiBpbmRleCBvZiB0b3AsIGxlZnQgdGlsZSBhbmQgdGhlIG51bWJlciBvZiB0aWxlcyBh Y3Jvc3MgYW5kIGRvd24uCisgICAgICAgIHJldHVybiBJbnRSZWN0KHRvcExlZnQueCgpLCB0b3BM ZWZ0LnkoKSwgYm90dG9tUmlnaHQueCgpIC0gdG9wTGVmdC54KCkgKyAxLCBib3R0b21SaWdodC55 KCkgLSB0b3BMZWZ0LnkoKSArIDEpOworICAgIH0KIAotICAgIC8vIFJldHVybiBpbmRleCBvZiB0 b3AsIGxlZnQgdGlsZSBhbmQgdGhlIG51bWJlciBvZiB0aWxlcyBhY3Jvc3MgYW5kIGRvd24uCi0g ICAgcmV0dXJuIEludFJlY3QodG9wTGVmdC54KCksIHRvcExlZnQueSgpLCBib3R0b21SaWdodC54 KCkgLSB0b3BMZWZ0LngoKSArIDEsIGJvdHRvbVJpZ2h0LnkoKSAtIHRvcExlZnQueSgpICsgMSk7 CisgICAgcmV0dXJuIEludFJlY3QoKTsKIH0KIAogZG91YmxlIFRpbGVHcmlkOjpyZXRhaW5lZFRp bGVCYWNraW5nU3RvcmVNZW1vcnkoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvVGlsZUdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL1RpbGVHcmlkLmgKaW5kZXggMzBkNGJjNWRkYjBhOTU5MGU0ZGQxNzA5MjVj NGQ3N2I1NjMxN2M5MS4uYThkZTAxOTZlYzVlMzNlN2E2Mzk2NGM0YjJjZjZlM2RlY2Y2NTI4NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvVGlsZUdyaWQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9UaWxlR3JpZC5oCkBA IC0xMTAsNyArMTEwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFRpbGVOZWVkc0Rpc3BsYXlJ blJlY3QoY29uc3QgVGlsZUluZGV4JiwgVGlsZUluZm8mLCBjb25zdCBJbnRSZWN0JiByZXBhaW50 UmVjdEluVGlsZUNvb3JkcywgY29uc3QgSW50UmVjdCYgY292ZXJhZ2VSZWN0SW5UaWxlQ29vcmRz KTsKIAogICAgIEludFJlY3QgcmVjdEZvclRpbGVJbmRleChjb25zdCBUaWxlSW5kZXgmKSBjb25z dDsKLSAgICB2b2lkIGdldFRpbGVJbmRleFJhbmdlRm9yUmVjdChjb25zdCBJbnRSZWN0JiwgVGls ZUluZGV4JiB0b3BMZWZ0LCBUaWxlSW5kZXgmIGJvdHRvbVJpZ2h0KSBjb25zdDsKKyAgICBib29s IGdldFRpbGVJbmRleFJhbmdlRm9yUmVjdChjb25zdCBJbnRSZWN0JiwgVGlsZUluZGV4JiB0b3BM ZWZ0LCBUaWxlSW5kZXgmIGJvdHRvbVJpZ2h0KSBjb25zdDsKIAogICAgIGVudW0gY2xhc3MgQ292 ZXJhZ2VUeXBlIHsgUHJpbWFyeVRpbGVzLCBTZWNvbmRhcnlUaWxlcyB9OwogICAgIEludFJlY3Qg ZW5zdXJlVGlsZXNGb3JSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIENvdmVyYWdlVHlwZSk7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggODk3MjAzYjFhNzA4ODQ1YzE0YmUyYjdlM2JkZTJiODM0NTI2YzdjMy4uYzI4YTk3ZGY5YWE1 ZmJjNzg0NzI0ZDBjOGY4Nzk5NTM3NGFhOTFiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2 LTA3LTE0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1MgV0syXSBXaGVuIHNjcm9sbGluZyBhcHBsZS5jb20vbXVzaWMgb24gaVBhZCBQcm8gaW4g bGFuZHNjYXBlLCBsZWZ0LWhhbmQgdGlsZXMgYXBwZWFyIGZpcnN0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk3OTgKKyAgICAgICAgcmRhcjovL3By b2JsZW0vMjczNjI3MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgCisgICAgICAgIFRlc3Qgd2l0aCBhbiBvZmZzY3JlZW4gdGlsZWQgbGF5ZXIuCisKKyAg ICAgICAgKiBjb21wb3NpdGluZy90aWxpbmcvb2Zmc2NyZWVuLXRpbGVkLWxheWVyLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvdGlsaW5nL29mZnNjcmVlbi10aWxl ZC1sYXllci5odG1sOiBBZGRlZC4KKwogMjAxNi0wNy0xMiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIw MzEzMS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9vZmZzY3Jl ZW4tdGlsZWQtbGF5ZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGls aW5nL29mZnNjcmVlbi10aWxlZC1sYXllci1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjZkMTM5 N2I3NTBmN2MwMGJmNWZkZTc4NGE2ZmIyMDQ4ZjI5MDY5ZAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9vZmZzY3JlZW4tdGlsZWQtbGF5ZXItZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMzggQEAKKyhHcmFwaGljc0xheWVyCisgIChhbmNob3IgMC4wMCAw LjAwKQorICAoYm91bmRzIDIyMDguMDAgMjgwOC4wMCkKKyAgKHZpc2libGUgcmVjdCAwLjAwLCAw LjAwIDc4NS4wMCB4IDU4NS4wMCkKKyAgKGNvdmVyYWdlIHJlY3QgMC4wMCwgMC4wMCA3ODUuMDAg eCA1ODUuMDApCisgIChpbnRlcnNlY3RzIGNvdmVyYWdlIHJlY3QgMSkKKyAgKGNvbnRlbnRzU2Nh bGUgMS4wMCkKKyAgKGNoaWxkcmVuIDEKKyAgICAoR3JhcGhpY3NMYXllcgorICAgICAgKGJvdW5k cyAyMjA4LjAwIDI4MDguMDApCisgICAgICAoY29udGVudHNPcGFxdWUgMSkKKyAgICAgICh2aXNp YmxlIHJlY3QgMC4wMCwgMC4wMCA3ODUuMDAgeCA1ODUuMDApCisgICAgICAoY292ZXJhZ2UgcmVj dCAwLjAwLCAwLjAwIDc4NS4wMCB4IDU4NS4wMCkKKyAgICAgIChpbnRlcnNlY3RzIGNvdmVyYWdl IHJlY3QgMSkKKyAgICAgIChjb250ZW50c1NjYWxlIDEuMDApCisgICAgICAodGlsZSBjYWNoZSBj b3ZlcmFnZSAwLCAwIDEwMjQgeCAxMDI0KQorICAgICAgKHRpbGUgc2l6ZSA1MTIgeCA1MTIpCisg ICAgICAodG9wIGxlZnQgdGlsZSAwLCAwIHRpbGVzIGdyaWQgMiB4IDIpCisgICAgICAoY2hpbGRy ZW4gMQorICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiA4LjAwIDE4 MDAuMDApCisgICAgICAgICAgKGJvdW5kcyAyMjAwLjAwIDEwMDAuMDApCisgICAgICAgICAgKHVz aW5nVGlsZWRMYXllciAxKQorICAgICAgICAgIChjb250ZW50c09wYXF1ZSAxKQorICAgICAgICAg IChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAodmlzaWJsZSByZWN0IDAuMDAsIDAuMDAgMC4w MCB4IDAuMDApCisgICAgICAgICAgKGNvdmVyYWdlIHJlY3QgLTguMDAsIC0xODAwLjAwIDc4NS4w MCB4IDU4NS4wMCkKKyAgICAgICAgICAoaW50ZXJzZWN0cyBjb3ZlcmFnZSByZWN0IDApCisgICAg ICAgICAgKGNvbnRlbnRzU2NhbGUgMS4wMCkKKyAgICAgICAgICAodGlsZSBjYWNoZSBjb3ZlcmFn ZSAwLCAwIDAgeCAwKQorICAgICAgICAgICh0aWxlIHNpemUgNTEyIHggNTEyKQorICAgICAgICAg ICh0b3AgbGVmdCB0aWxlIDAsIDAgdGlsZXMgZ3JpZCAwIHggMCkKKyAgICAgICAgKQorICAgICAg KQorICAgICkKKyAgKQorKQorU29tZSB0ZXh0IGhlcmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy90aWxpbmcvb2Zmc2NyZWVuLXRpbGVkLWxheWVyLmh0bWwgYi9MYXlvdXRU ZXN0cy9jb21wb3NpdGluZy90aWxpbmcvb2Zmc2NyZWVuLXRpbGVkLWxheWVyLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uMTUxOWE1NTgxMDMxN2QxNzNlOTI5NmZiM2UxYzJhMWM0YzUwNDQ4ZgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9vZmZzY3JlZW4tdGlsZWQt bGF5ZXIuaHRtbApAQCAtMCwwICsxLDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+Cis8 aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5ib3ggeworICAgICAgICAgICAgbWFyZ2luLXRv cDogMTgwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMDAwcHg7CisgICAgICAgICAgICB3aWR0 aDogMjIwMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgICAgICAg fQorICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0ZWQgeworICAgICAgICAgICAgLXdlYmtpdC10 cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxz Y3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgIHRlc3RS dW5uZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgIGZ1bmN0aW9uIGRvVGVzdCgpCisgICAgICAg IHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgICAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2xheWVycycpLmlubmVyVGV4dCA9IGludGVybmFscy5s YXllclRyZWVBc1RleHQoZG9jdW1lbnQsCisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5M QVlFUl9UUkVFX0lOQ0xVREVTX1ZJU0lCTEVfUkVDVFMgfCBpbnRlcm5hbHMuTEFZRVJfVFJFRV9J TkNMVURFU19USUxFX0NBQ0hFUyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZG9UZXN0LCBmYWxzZSk7 CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwcmUgaWQ9ImxheWVycyI+PC9wcmU+ CisgICAgPGRpdiBjbGFzcz0iY29tcG9zaXRlZCBib3giPgorICAgICAgICBTb21lIHRleHQgaGVy ZS4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K