157856 2016-05-18 12:27:47 -0700 Remove LayoutUnit::operator unsigned(). 2016-05-18 16:24:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue simon.fraser oldest_to_newest 1194367 0 zalan 2016-05-18 12:27:47 -0700 Conversion from LayoutUnit to integral type is lossy. Don't do it implicitly. 1194391 1 279275 zalan 2016-05-18 12:52:43 -0700 Created attachment 279275 Patch 1194420 2 279284 zalan 2016-05-18 14:37:55 -0700 Created attachment 279284 Patch 1194422 3 279284 simon.fraser 2016-05-18 14:46:56 -0700 Comment on attachment 279284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279284&action=review > Source/WebCore/page/EventHandler.cpp:1136 > + HitTestResult result(point, nonNegativePaddingHeight, nonNegativePaddingWidth, nonNegativePaddingHeight, nonNegativePaddingWidth); This should really take a BoxExtent<unsigned>, but that can be fixed later. 1194499 4 279284 commit-queue 2016-05-18 16:24:48 -0700 Comment on attachment 279284 Patch Clearing flags on attachment: 279284 Committed r201114: <http://trac.webkit.org/changeset/201114> 1194500 5 commit-queue 2016-05-18 16:24:52 -0700 All reviewed patches have been landed. Closing bug. 279275 2016-05-18 12:52:43 -0700 2016-05-18 13:42:21 -0700 Patch bug-157856-20160518125341.patch text/plain 5710 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2OTEyYTc4MGFjMTg5 MTFiYjVjMDVkOTRiYzcxNjY4YzNjZjQzNS4uMmMyZGUzYzk3NTQwODQ2NTQ0ODFkOWIzZjZjYzlm ZDhhYWYwOTczNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA1LTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIExheW91dFVuaXQ6 Om9wZXJhdG9yIHVuc2lnbmVkKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTc4NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDb252ZXJ0aW5nIExheW91dFVuaXQgdmFsdWVzIHRvIHVuc2lnbmVkIGlz IGxvc3N5LiBXZSBzaG91bGQgYXZvaWQKKyAgICAgICAgc3VjaCBpbXBsaWNpdCBjb252ZXJzaW9u cy4gCisKKyAgICAgICAgTm8gYmVoYXZpb3VyIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvSW1h Z2VJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VJbnB1dFR5cGU6OmhlaWdo dCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUlucHV0VHlwZTo6d2lkdGgpOgorICAgICAgICAq IHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6 aGl0VGVzdFJlc3VsdEF0UG9pbnQpOgorICAgICAgICAqIHBsYXRmb3JtL0xheW91dFVuaXQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dFVuaXQ6Om9wZXJhdG9yIHVuc2lnbmVkKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgpOgorCiAy MDE2LTA1LTE4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1N0cmVhbWVyXSB3ZWJhdWRpbyBjcmFzaCBvbiBBUk0gcGxhdGZvcm1zCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSW1hZ2VJbnB1dFR5cGUuY3BwCmluZGV4IGNhYzU1MDI5MmE0NTg3ZDQzOGNmOTNi ZGI5MGVkM2JkMjhiZGM1NzUuLmY1MmRiMTY5MTEyZTRmMDk3ZjJiMzliMzg1OGI1Y2E2YjJiZWM1 YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VJbnB1dFR5cGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VJbnB1dFR5cGUuY3BwCkBAIC0xODIsNyArMTgy LDcgQEAgdW5zaWduZWQgSW1hZ2VJbnB1dFR5cGU6OmhlaWdodCgpIGNvbnN0CiAgICAgICAgIC8v IElmIHRoZSBpbWFnZSBpcyBhdmFpbGFibGUsIHVzZSBpdHMgaGVpZ2h0LgogICAgICAgICBIVE1M SW1hZ2VMb2FkZXIqIGltYWdlTG9hZGVyID0gZWxlbWVudC0+aW1hZ2VMb2FkZXIoKTsKICAgICAg ICAgaWYgKGltYWdlTG9hZGVyICYmIGltYWdlTG9hZGVyLT5pbWFnZSgpKQotICAgICAgICAgICAg cmV0dXJuIGltYWdlTG9hZGVyLT5pbWFnZSgpLT5pbWFnZVNpemVGb3JSZW5kZXJlcihlbGVtZW50 LT5yZW5kZXJlcigpLCAxKS5oZWlnaHQoKTsKKyAgICAgICAgICAgIHJldHVybiBpbWFnZUxvYWRl ci0+aW1hZ2UoKS0+aW1hZ2VTaXplRm9yUmVuZGVyZXIoZWxlbWVudC0+cmVuZGVyZXIoKSwgMSku aGVpZ2h0KCkudG9VbnNpZ25lZCgpOwogICAgIH0KIAogICAgIGVsZW1lbnQtPmRvY3VtZW50KCku dXBkYXRlTGF5b3V0KCk7CkBAIC0yMDMsNyArMjAzLDcgQEAgdW5zaWduZWQgSW1hZ2VJbnB1dFR5 cGU6OndpZHRoKCkgY29uc3QKICAgICAgICAgLy8gSWYgdGhlIGltYWdlIGlzIGF2YWlsYWJsZSwg dXNlIGl0cyB3aWR0aC4KICAgICAgICAgSFRNTEltYWdlTG9hZGVyKiBpbWFnZUxvYWRlciA9IGVs ZW1lbnQtPmltYWdlTG9hZGVyKCk7CiAgICAgICAgIGlmIChpbWFnZUxvYWRlciAmJiBpbWFnZUxv YWRlci0+aW1hZ2UoKSkKLSAgICAgICAgICAgIHJldHVybiBpbWFnZUxvYWRlci0+aW1hZ2UoKS0+ aW1hZ2VTaXplRm9yUmVuZGVyZXIoZWxlbWVudC0+cmVuZGVyZXIoKSwgMSkud2lkdGgoKTsKKyAg ICAgICAgICAgIHJldHVybiBpbWFnZUxvYWRlci0+aW1hZ2UoKS0+aW1hZ2VTaXplRm9yUmVuZGVy ZXIoZWxlbWVudC0+cmVuZGVyZXIoKSwgMSkud2lkdGgoKS50b1Vuc2lnbmVkKCk7CiAgICAgfQog CiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS51cGRhdGVMYXlvdXQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcAppbmRleCAwMGFjNWJhM2U5NTVjMjhiZGRkZjEwNmEwNzhlYTdkNDdj YWUxM2NkLi5kYjcwYTQ3YzkzNjNiZDVlZmE3MDlmMWE3ZjE5NTAzODc2OTE0ZWM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0xMTMxLDcgKzExMzEsOSBAQCBIaXRUZXN0 UmVzdWx0IEV2ZW50SGFuZGxlcjo6aGl0VGVzdFJlc3VsdEF0UG9pbnQoY29uc3QgTGF5b3V0UG9p bnQmIHBvaW50LCBIaXRUZQogICAgICAgICB9CiAgICAgfQogCi0gICAgSGl0VGVzdFJlc3VsdCBy ZXN1bHQocG9pbnQsIHBhZGRpbmcuaGVpZ2h0KCksIHBhZGRpbmcud2lkdGgoKSwgcGFkZGluZy5o ZWlnaHQoKSwgcGFkZGluZy53aWR0aCgpKTsKKyAgICB1bnNpZ25lZCBub25OZWdhdGl2ZVBhZGRp bmdXaWR0aCA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIHBhZGRpbmcud2lkdGgoKSkudG9VbnNp Z25lZCgpOworICAgIHVuc2lnbmVkIG5vbk5lZ2F0aXZlUGFkZGluZ0hlaWdodCA9IHN0ZDo6bWF4 PExheW91dFVuaXQ+KDAsIHBhZGRpbmcuaGVpZ2h0KCkpLnRvVW5zaWduZWQoKTsKKyAgICBIaXRU ZXN0UmVzdWx0IHJlc3VsdChwb2ludCwgbm9uTmVnYXRpdmVQYWRkaW5nSGVpZ2h0LCBub25OZWdh dGl2ZVBhZGRpbmdXaWR0aCwgbm9uTmVnYXRpdmVQYWRkaW5nSGVpZ2h0LCBub25OZWdhdGl2ZVBh ZGRpbmdXaWR0aCk7CiAKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gbV9mcmFtZS5jb250 ZW50UmVuZGVyZXIoKTsKICAgICBpZiAoIXJlbmRlclZpZXcpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9MYXlvdXRVbml0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9M YXlvdXRVbml0LmgKaW5kZXggMzIwNjE2NjgzNzFmOGQxN2QzYmEwNGUyM2U1Y2FlNTcyOWM0ODNh ZS4uN2RlNjliODVhOTk4YWZmNTc1YTNmMDc2ZWUxMzhlOGViNjdhZGFlZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGF5b3V0VW5pdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0xheW91dFVuaXQuaApAQCAtMTE0LDcgKzExNCw2IEBAIHB1YmxpYzoKICAgICB1 bnNpZ25lZCB0b1Vuc2lnbmVkKCkgY29uc3QgeyBSRVBPUlRfT1ZFUkZMT1cobV92YWx1ZSA+PSAw KTsgcmV0dXJuIHRvSW50KCk7IH0KIAogICAgIG9wZXJhdG9yIGludCgpIGNvbnN0IHsgcmV0dXJu IHRvSW50KCk7IH0KLSAgICBvcGVyYXRvciB1bnNpZ25lZCgpIGNvbnN0IHsgcmV0dXJuIHRvVW5z aWduZWQoKTsgfQogICAgIG9wZXJhdG9yIGZsb2F0KCkgY29uc3QgeyByZXR1cm4gdG9GbG9hdCgp OyB9CiAgICAgb3BlcmF0b3IgZG91YmxlKCkgY29uc3QgeyByZXR1cm4gdG9Eb3VibGUoKTsgfQog ICAgIG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX3ZhbHVlOyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGUwMGM3NmU1OTQ4MTBh Y2Y0NzNiMzYzMDc5NDEyOTRiODc5NGFiMDcuLjdiNzkwZTU4YjNlMGY4YWQyZmFiZWQyMjJlNmI1 MDlmZTdiNjVhNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCkBAIC00MTIsMTYgKzQxMiwxNiBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0 ZUNvbHVtbkNvdW50QW5kV2lkdGgoKQogICAgIExheW91dFVuaXQgYXZhaWxXaWR0aCA9IGRlc2ly ZWRDb2x1bW5XaWR0aDsKICAgICBMYXlvdXRVbml0IGNvbEdhcCA9IGNvbHVtbkdhcCgpOwogICAg IExheW91dFVuaXQgY29sV2lkdGggPSBzdGQ6Om1heDxMYXlvdXRVbml0PihMYXlvdXRVbml0Ojpm cm9tUGl4ZWwoMSksIExheW91dFVuaXQoc3R5bGUoKS5jb2x1bW5XaWR0aCgpKSk7Ci0gICAgaW50 IGNvbENvdW50ID0gc3RkOjptYXg8aW50PigxLCBzdHlsZSgpLmNvbHVtbkNvdW50KCkpOworICAg IHVuc2lnbmVkIGNvbENvdW50ID0gc3RkOjptYXg8dW5zaWduZWQ+KDEsIHN0eWxlKCkuY29sdW1u Q291bnQoKSk7CiAKICAgICBpZiAoc3R5bGUoKS5oYXNBdXRvQ29sdW1uV2lkdGgoKSAmJiAhc3R5 bGUoKS5oYXNBdXRvQ29sdW1uQ291bnQoKSkgewogICAgICAgICBkZXNpcmVkQ29sdW1uQ291bnQg PSBjb2xDb3VudDsKICAgICAgICAgZGVzaXJlZENvbHVtbldpZHRoID0gc3RkOjptYXg8TGF5b3V0 VW5pdD4oMCwgKGF2YWlsV2lkdGggLSAoKGRlc2lyZWRDb2x1bW5Db3VudCAtIDEpICogY29sR2Fw KSkgLyBkZXNpcmVkQ29sdW1uQ291bnQpOwogICAgIH0gZWxzZSBpZiAoIXN0eWxlKCkuaGFzQXV0 b0NvbHVtbldpZHRoKCkgJiYgc3R5bGUoKS5oYXNBdXRvQ29sdW1uQ291bnQoKSkgewotICAgICAg ICBkZXNpcmVkQ29sdW1uQ291bnQgPSBzdGQ6Om1heDxMYXlvdXRVbml0PigxLCAoYXZhaWxXaWR0 aCArIGNvbEdhcCkgLyAoY29sV2lkdGggKyBjb2xHYXApKTsKKyAgICAgICAgZGVzaXJlZENvbHVt bkNvdW50ID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMSwgKGF2YWlsV2lkdGggKyBjb2xHYXApIC8g KGNvbFdpZHRoICsgY29sR2FwKSkudG9VbnNpZ25lZCgpOwogICAgICAgICBkZXNpcmVkQ29sdW1u V2lkdGggPSAoKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gZGVzaXJlZENvbHVtbkNvdW50KSAtIGNv bEdhcDsKICAgICB9IGVsc2UgewotICAgICAgICBkZXNpcmVkQ29sdW1uQ291bnQgPSBzdGQ6Om1h eDxMYXlvdXRVbml0PihzdGQ6Om1pbjxMYXlvdXRVbml0Pihjb2xDb3VudCwgKGF2YWlsV2lkdGgg KyBjb2xHYXApIC8gKGNvbFdpZHRoICsgY29sR2FwKSksIDEpOworICAgICAgICBkZXNpcmVkQ29s dW1uQ291bnQgPSBzdGQ6Om1heDxMYXlvdXRVbml0PihzdGQ6Om1pbjxMYXlvdXRVbml0Pihjb2xD b3VudCwgKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gKGNvbFdpZHRoICsgY29sR2FwKSksIDEpLnRv VW5zaWduZWQoKTsKICAgICAgICAgZGVzaXJlZENvbHVtbldpZHRoID0gKChhdmFpbFdpZHRoICsg Y29sR2FwKSAvIGRlc2lyZWRDb2x1bW5Db3VudCkgLSBjb2xHYXA7CiAgICAgfQogICAgIHNldENv bXB1dGVkQ29sdW1uQ291bnRBbmRXaWR0aChkZXNpcmVkQ29sdW1uQ291bnQsIGRlc2lyZWRDb2x1 bW5XaWR0aCk7Cg== 279284 2016-05-18 14:37:55 -0700 2016-05-18 16:24:48 -0700 Patch bug-157856-20160518143854.patch text/plain 6484 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIyOWNjYjdkNzQ1ZWU1 ZjU4MDAxYTA4YWFlNWJiYWI4MDJkZmJmNC4uOWMzZWY4ZTFkZTk3MzcyMTM0NGY5NmZmMjUzNWRl NDVhMWFjMzBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA1LTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIExheW91dFVuaXQ6 Om9wZXJhdG9yIHVuc2lnbmVkKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTc4NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDb252ZXJ0aW5nIExheW91dFVuaXQgdmFsdWVzIHRvIHVuc2lnbmVkIGlz IGxvc3N5LiBXZSBzaG91bGQgYXZvaWQKKyAgICAgICAgc3VjaCBpbXBsaWNpdCBjb252ZXJzaW9u cy4gCisKKyAgICAgICAgTm8gYmVoYXZpb3VyIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvSW1h Z2VJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VJbnB1dFR5cGU6OmhlaWdo dCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUlucHV0VHlwZTo6d2lkdGgpOgorICAgICAgICAq IHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6 aGl0VGVzdFJlc3VsdEF0UG9pbnQpOgorICAgICAgICAqIHBsYXRmb3JtL0xheW91dFVuaXQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dFVuaXQ6Om9wZXJhdG9yIHVuc2lnbmVkKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUNvbHVtbkNvdW50QW5kV2lkdGgpOgorCiAy MDE2LTA1LTE4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBN b2Rlcm4gSURCOiBBZGQgc3VwcG9ydCBmb3Igc2VydmVyIHNpZGUgY2xvc2luZyBvZiBvcGVuIGRh dGFiYXNlIGNvbm5lY3Rpb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbWFn ZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlSW5wdXRUeXBlLmNwcApp bmRleCBjYWM1NTAyOTJhNDU4N2Q0MzhjZjkzYmRiOTBlZDNiZDI4YmRjNTc1Li5mNTJkYjE2OTEx MmU0ZjA5N2YyYjM5YjM4NThiNWNhNmIyYmVjNWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0ltYWdlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdl SW5wdXRUeXBlLmNwcApAQCAtMTgyLDcgKzE4Miw3IEBAIHVuc2lnbmVkIEltYWdlSW5wdXRUeXBl OjpoZWlnaHQoKSBjb25zdAogICAgICAgICAvLyBJZiB0aGUgaW1hZ2UgaXMgYXZhaWxhYmxlLCB1 c2UgaXRzIGhlaWdodC4KICAgICAgICAgSFRNTEltYWdlTG9hZGVyKiBpbWFnZUxvYWRlciA9IGVs ZW1lbnQtPmltYWdlTG9hZGVyKCk7CiAgICAgICAgIGlmIChpbWFnZUxvYWRlciAmJiBpbWFnZUxv YWRlci0+aW1hZ2UoKSkKLSAgICAgICAgICAgIHJldHVybiBpbWFnZUxvYWRlci0+aW1hZ2UoKS0+ aW1hZ2VTaXplRm9yUmVuZGVyZXIoZWxlbWVudC0+cmVuZGVyZXIoKSwgMSkuaGVpZ2h0KCk7Cisg ICAgICAgICAgICByZXR1cm4gaW1hZ2VMb2FkZXItPmltYWdlKCktPmltYWdlU2l6ZUZvclJlbmRl cmVyKGVsZW1lbnQtPnJlbmRlcmVyKCksIDEpLmhlaWdodCgpLnRvVW5zaWduZWQoKTsKICAgICB9 CiAKICAgICBlbGVtZW50LT5kb2N1bWVudCgpLnVwZGF0ZUxheW91dCgpOwpAQCAtMjAzLDcgKzIw Myw3IEBAIHVuc2lnbmVkIEltYWdlSW5wdXRUeXBlOjp3aWR0aCgpIGNvbnN0CiAgICAgICAgIC8v IElmIHRoZSBpbWFnZSBpcyBhdmFpbGFibGUsIHVzZSBpdHMgd2lkdGguCiAgICAgICAgIEhUTUxJ bWFnZUxvYWRlciogaW1hZ2VMb2FkZXIgPSBlbGVtZW50LT5pbWFnZUxvYWRlcigpOwogICAgICAg ICBpZiAoaW1hZ2VMb2FkZXIgJiYgaW1hZ2VMb2FkZXItPmltYWdlKCkpCi0gICAgICAgICAgICBy ZXR1cm4gaW1hZ2VMb2FkZXItPmltYWdlKCktPmltYWdlU2l6ZUZvclJlbmRlcmVyKGVsZW1lbnQt PnJlbmRlcmVyKCksIDEpLndpZHRoKCk7CisgICAgICAgICAgICByZXR1cm4gaW1hZ2VMb2FkZXIt PmltYWdlKCktPmltYWdlU2l6ZUZvclJlbmRlcmVyKGVsZW1lbnQtPnJlbmRlcmVyKCksIDEpLndp ZHRoKCkudG9VbnNpZ25lZCgpOwogICAgIH0KIAogICAgIGVsZW1lbnQtPmRvY3VtZW50KCkudXBk YXRlTGF5b3V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggMDBhYzVi YTNlOTU1YzI4YmRkZGYxMDZhMDc4ZWE3ZDQ3Y2FlMTNjZC4uZGI3MGE0N2M5MzYzYmQ1ZWZhNzA5 ZjFhN2YxOTUwMzg3NjkxNGVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApA QCAtMTEzMSw3ICsxMTMxLDkgQEAgSGl0VGVzdFJlc3VsdCBFdmVudEhhbmRsZXI6OmhpdFRlc3RS ZXN1bHRBdFBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgSGl0VGUKICAgICAgICAgfQog ICAgIH0KIAotICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0KHBvaW50LCBwYWRkaW5nLmhlaWdodCgp LCBwYWRkaW5nLndpZHRoKCksIHBhZGRpbmcuaGVpZ2h0KCksIHBhZGRpbmcud2lkdGgoKSk7Cisg ICAgdW5zaWduZWQgbm9uTmVnYXRpdmVQYWRkaW5nV2lkdGggPSBzdGQ6Om1heDxMYXlvdXRVbml0 PigwLCBwYWRkaW5nLndpZHRoKCkpLnRvVW5zaWduZWQoKTsKKyAgICB1bnNpZ25lZCBub25OZWdh dGl2ZVBhZGRpbmdIZWlnaHQgPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBwYWRkaW5nLmhlaWdo dCgpKS50b1Vuc2lnbmVkKCk7CisgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQocG9pbnQsIG5vbk5l Z2F0aXZlUGFkZGluZ0hlaWdodCwgbm9uTmVnYXRpdmVQYWRkaW5nV2lkdGgsIG5vbk5lZ2F0aXZl UGFkZGluZ0hlaWdodCwgbm9uTmVnYXRpdmVQYWRkaW5nV2lkdGgpOwogCiAgICAgUmVuZGVyVmll dyogcmVuZGVyVmlldyA9IG1fZnJhbWUuY29udGVudFJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5k ZXJWaWV3KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGF5b3V0VW5pdC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGF5b3V0VW5pdC5oCmluZGV4IDMyMDYxNjY4Mzcx ZjhkMTdkM2JhMDRlMjNlNWNhZTU3MjljNDgzYWUuLjdkZTY5Yjg1YTk5OGFmZjU3NWEzZjA3NmVl MTM4ZThlYjY3YWRhZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xheW91 dFVuaXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MYXlvdXRVbml0LmgKQEAgLTEx NCw3ICsxMTQsNiBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgdG9VbnNpZ25lZCgpIGNvbnN0IHsg UkVQT1JUX09WRVJGTE9XKG1fdmFsdWUgPj0gMCk7IHJldHVybiB0b0ludCgpOyB9CiAKICAgICBv cGVyYXRvciBpbnQoKSBjb25zdCB7IHJldHVybiB0b0ludCgpOyB9Ci0gICAgb3BlcmF0b3IgdW5z aWduZWQoKSBjb25zdCB7IHJldHVybiB0b1Vuc2lnbmVkKCk7IH0KICAgICBvcGVyYXRvciBmbG9h dCgpIGNvbnN0IHsgcmV0dXJuIHRvRmxvYXQoKTsgfQogICAgIG9wZXJhdG9yIGRvdWJsZSgpIGNv bnN0IHsgcmV0dXJuIHRvRG91YmxlKCk7IH0KICAgICBvcGVyYXRvciBib29sKCkgY29uc3QgeyBy ZXR1cm4gbV92YWx1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcAppbmRleCBiMmYxOTE4ZTRlYjA1Mzc2MjBjYmQzOTIxYmYwMjI0MDQzMWQzOGJjLi4w Nzc1NzhlZmNjMTQzODhlMmYxMTU2NjhlMDZjYmIxMTlmMzc2ZTRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtNDEyLDE2ICs0MTIsMTYgQEAg dm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVDb2x1bW5Db3VudEFuZFdpZHRoKCkKICAgICBM YXlvdXRVbml0IGF2YWlsV2lkdGggPSBkZXNpcmVkQ29sdW1uV2lkdGg7CiAgICAgTGF5b3V0VW5p dCBjb2xHYXAgPSBjb2x1bW5HYXAoKTsKICAgICBMYXlvdXRVbml0IGNvbFdpZHRoID0gc3RkOjpt YXg8TGF5b3V0VW5pdD4oTGF5b3V0VW5pdDo6ZnJvbVBpeGVsKDEpLCBMYXlvdXRVbml0KHN0eWxl KCkuY29sdW1uV2lkdGgoKSkpOwotICAgIGludCBjb2xDb3VudCA9IHN0ZDo6bWF4PGludD4oMSwg c3R5bGUoKS5jb2x1bW5Db3VudCgpKTsKKyAgICB1bnNpZ25lZCBjb2xDb3VudCA9IHN0ZDo6bWF4 PHVuc2lnbmVkPigxLCBzdHlsZSgpLmNvbHVtbkNvdW50KCkpOwogCiAgICAgaWYgKHN0eWxlKCku aGFzQXV0b0NvbHVtbldpZHRoKCkgJiYgIXN0eWxlKCkuaGFzQXV0b0NvbHVtbkNvdW50KCkpIHsK ICAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0gY29sQ291bnQ7CiAgICAgICAgIGRlc2lyZWRD b2x1bW5XaWR0aCA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIChhdmFpbFdpZHRoIC0gKChkZXNp cmVkQ29sdW1uQ291bnQgLSAxKSAqIGNvbEdhcCkpIC8gZGVzaXJlZENvbHVtbkNvdW50KTsKICAg ICB9IGVsc2UgaWYgKCFzdHlsZSgpLmhhc0F1dG9Db2x1bW5XaWR0aCgpICYmIHN0eWxlKCkuaGFz QXV0b0NvbHVtbkNvdW50KCkpIHsKLSAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0gc3RkOjpt YXg8TGF5b3V0VW5pdD4oMSwgKGF2YWlsV2lkdGggKyBjb2xHYXApIC8gKGNvbFdpZHRoICsgY29s R2FwKSk7CisgICAgICAgIGRlc2lyZWRDb2x1bW5Db3VudCA9IHN0ZDo6bWF4PExheW91dFVuaXQ+ KDEsIChhdmFpbFdpZHRoICsgY29sR2FwKSAvIChjb2xXaWR0aCArIGNvbEdhcCkpLnRvVW5zaWdu ZWQoKTsKICAgICAgICAgZGVzaXJlZENvbHVtbldpZHRoID0gKChhdmFpbFdpZHRoICsgY29sR2Fw KSAvIGRlc2lyZWRDb2x1bW5Db3VudCkgLSBjb2xHYXA7CiAgICAgfSBlbHNlIHsKLSAgICAgICAg ZGVzaXJlZENvbHVtbkNvdW50ID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oc3RkOjptaW48TGF5b3V0 VW5pdD4oY29sQ291bnQsIChhdmFpbFdpZHRoICsgY29sR2FwKSAvIChjb2xXaWR0aCArIGNvbEdh cCkpLCAxKTsKKyAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0gc3RkOjptYXg8TGF5b3V0VW5p dD4oc3RkOjptaW48TGF5b3V0VW5pdD4oY29sQ291bnQsIChhdmFpbFdpZHRoICsgY29sR2FwKSAv IChjb2xXaWR0aCArIGNvbEdhcCkpLCAxKS50b1Vuc2lnbmVkKCk7CiAgICAgICAgIGRlc2lyZWRD b2x1bW5XaWR0aCA9ICgoYXZhaWxXaWR0aCArIGNvbEdhcCkgLyBkZXNpcmVkQ29sdW1uQ291bnQp IC0gY29sR2FwOwogICAgIH0KICAgICBzZXRDb21wdXRlZENvbHVtbkNvdW50QW5kV2lkdGgoZGVz aXJlZENvbHVtbkNvdW50LCBkZXNpcmVkQ29sdW1uV2lkdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGYyYWMxYmMzMjIxOTE0ZjgxYTlk YzU1NTcwOGY2MjI0NDk2ZGFjMTEuLjZiZDUxYTQzNjBkMTAwY2QxZTgxMDAwYjdhMzQwYmIwNDEz ODk3NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTUxMDQsNyArNTEwNCw3IEBAIGJvb2wgV2ViUGFnZTo6cGx1Z0luSXNQcmltYXJ5U2l6 ZShXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50JiBwbHVnSW5JbWFnZUVsCiAKICAgICBM YXlvdXRVbml0IGNvbnRlbnRBcmVhID0gcGx1Z2luUmVuZGVyQm94LmNvbnRlbnRXaWR0aCgpICog cGx1Z2luUmVuZGVyQm94LmNvbnRlbnRIZWlnaHQoKTsKICAgICBpZiAoY29udGVudEFyZWEgPiBj YW5kaWRhdGVQbHVnSW5BcmVhICogcHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luU2VhcmNoQnVja2V0 U2l6ZSkgewotICAgICAgICBjYW5kaWRhdGVQbHVnSW5BcmVhID0gY29udGVudEFyZWE7CisgICAg ICAgIGNhbmRpZGF0ZVBsdWdJbkFyZWEgPSBjb250ZW50QXJlYS50b1Vuc2lnbmVkKCk7CiAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7Cg==