187673 2018-07-13 17:03:48 -0700 Correctly adjust scroll offsets when a page is zoomed 2018-07-16 21:44:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner commit-queue jonlee rniwa thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1442109 0 megan_gardner 2018-07-13 17:03:48 -0700 Correctly adjust scroll offsets when a page is zoomed 1442114 1 345005 megan_gardner 2018-07-13 17:07:41 -0700 Created attachment 345005 Patch 1442123 2 345005 wenson_hsieh 2018-07-13 17:30:43 -0700 Comment on attachment 345005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345005&action=review > Source/WebCore/page/ios/EventHandlerIOS.mm:595 > + float insetScreenLeftEdge = screenLeftEdge + edgeDistanceThreashold.width; Nit - edgeDistanceThreashold => edgeDistanceThreshold 1442191 3 megan_gardner 2018-07-14 00:45:47 -0700 rdar://41712829 1442272 4 345005 wenson_hsieh 2018-07-14 20:55:05 -0700 Comment on attachment 345005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345005&action=review > Source/WebCore/page/ios/EventHandlerIOS.mm:591 > + CGSize edgeDistanceThreashold = CGRect(screenRect).size; These three lines can just be `CGSize edgeDistanceThreshold = screenRect.size() / 10;`. Not new to this patch, but I think screenPoint and screenRect are confusing names — it wasn't obvious to me that these are actually in content coordinates (when first reading this, I had assumed that these were in screen coordinates). Should these be `positionInContentCoordinates` and `unobscuredContentRect` instead? However, as Tim pointed out in https://bugs.webkit.org/show_bug.cgi?id=182815, it seems a bit weird that this threshold would be so different depending on screen size (i.e. it would be much easier to get to the autoscroll margins on the largest iPad Pro, and more difficult on the smallest iPhone)...I think a fixed distance around the edges avoids this problem, but since screenPoint and screenRect are in content coordinates, we need to adjust for the scale here. 1442539 5 345127 megan_gardner 2018-07-16 16:07:16 -0700 Created attachment 345127 Patch 1442583 6 345127 wenson_hsieh 2018-07-16 18:12:26 -0700 Comment on attachment 345127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345127&action=review This looks reasonable to me, with a few minor nits. > Source/WebCore/ChangeLog:11 > + Instead of just setting the offset arbitrarily to 100, use the screen rect We should update the ChangeLog to reflect the new changes. > Source/WebCore/page/ios/EventHandlerIOS.mm:593 > + CGSize edgeDistanceThreshold = CGRect(unobscuredContentRect).size; Can we just CGSizeMake(EDGE_DISTANCE_THRESHOLD / zoomFactor, EDGE_DISTANCE_THRESHOLD / zoomFactor)? 1442586 7 345135 megan_gardner 2018-07-16 18:43:23 -0700 Created attachment 345135 Patch for landing 1442602 8 commit-queue 2018-07-16 19:39:23 -0700 The commit-queue encountered the following flaky tests while processing attachment 345135: The commit-queue is continuing to process your patch. 1442603 9 commit-queue 2018-07-16 19:39:24 -0700 The commit-queue encountered the following flaky tests while processing attachment 345135: The commit-queue is continuing to process your patch. 1442632 10 commit-queue 2018-07-16 20:38:30 -0700 The commit-queue encountered the following flaky tests while processing attachment 345135: The commit-queue is continuing to process your patch. 1442633 11 commit-queue 2018-07-16 20:38:31 -0700 The commit-queue encountered the following flaky tests while processing attachment 345135: The commit-queue is continuing to process your patch. 1442642 12 345135 commit-queue 2018-07-16 21:44:29 -0700 Comment on attachment 345135 Patch for landing Clearing flags on attachment: 345135 Committed r233883: <https://trac.webkit.org/changeset/233883> 1442643 13 commit-queue 2018-07-16 21:44:31 -0700 All reviewed patches have been landed. Closing bug. 345005 2018-07-13 17:07:41 -0700 2018-07-16 16:07:14 -0700 Patch bug-187673-20180713170740.patch text/plain 4585 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE0ZDY4MDk1NGU2YWZh ZjAyYTg1MzI3NjBhYzdiNjljZGUzMjc1NS4uNmIzNGNjYmFiMTMwNzA0YzRlZjU3ZWFkNjY2Mjdj ZDBlMWFlYmZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA3LTEzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdGx5 IGFkanVzdCBzY3JvbGwgb2Zmc2V0cyB3aGVuIGEgcGFnZSBpcyB6b29tZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzY3MworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDE3MTI4Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV3JpdGluZyBhIHRlc3Qgbm93LCBidXQgSSB3YW50IHRvIGdldCB0aGlz IHJldmlld2VkLgorCisgICAgICAgIEluc3RlYWQgb2YganVzdCBzZXR0aW5nIHRoZSBvZmZzZXQg YXJiaXRyYXJpbHkgdG8gMTAwLCB1c2UgdGhlIHNjcmVlbiByZWN0CisgICAgICAgIHRvIG1ha2Ug dGhlIG9mZnNldCB3aGVyZSB3ZSBzdGFydCB0byBhZGp1c3QgdGhlIHNjcm9sbCBwb3NpdGlvbiB0 byBiZSAxMCUgCisgICAgICAgIG9mIHRoZSBzY3JlZW4gcmVjdC4gVGhpcyB3aWxsIGtlZXAgdXMg ZnJvbSBvdmVyIHNjcm9sbGluZyBpbiByYW5kb20gZGlyZWN0aW9ucywKKyAgICAgICAgd2hpY2gg aXMgd2hhdCB3YXMgaGFwcGVuaW5nIGJlZm9yZS4KKworICAgICAgICAqIHBhZ2UvaW9zL0V2ZW50 SGFuZGxlcklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmF1dG9zY3JvbGxBZGp1c3RtZW50RmFj dG9yRm9yU2NyZWVuQm91bmRhcmllcyk6CisKIDIwMTgtMDctMTMgIENoYXJsaWUgVHVybmVyICA8 Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFVzZSBzbWFydCBwb2lu dGVycyBmb3IgR3N0Qnl0ZVJlYWRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9p b3MvRXZlbnRIYW5kbGVySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRXZlbnRIYW5k bGVySU9TLm1tCmluZGV4IDJlZmEyNTFlZTRiOTk1MmJlMjA5OTExN2RiYmY4ZWY1ODA3YWFhMzEu LjIyY2NjZjQ0NzJkNzkxYmYxNDE2ZDYyNzE1MTcyOWM1OWMzZjBjMWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9FdmVudEhhbmRsZXJJT1MubW0KQEAgLTU4NywzNiArNTg3LDM3IEBAIHN0 YXRpYyBJbnRTaXplIGF1dG9zY3JvbGxBZGp1c3RtZW50RmFjdG9yRm9yU2NyZWVuQm91bmRhcmll cyhjb25zdCBJbnRQb2ludCYgc2NyCiAgICAgLy8gaW4gb3JkZXIgdG8gZ2V0IGF1dG9zY3JvbGxp bmcgdG8gZmVlbCBuYXR1cmFsIGluIHRoaXMgc2l0dWF0aW9uLgogICAgIAogICAgIEludFNpemUg YWRqdXN0bWVudEZhY3RvcjsKLSAgICAKLSNkZWZpbmUgRURHRV9ESVNUQU5DRV9USFJFU0hPTEQg MTAwCiAKKyAgICBDR1NpemUgZWRnZURpc3RhbmNlVGhyZWFzaG9sZCA9IENHUmVjdChzY3JlZW5S ZWN0KS5zaXplOworICAgIGVkZ2VEaXN0YW5jZVRocmVhc2hvbGQud2lkdGggPSBlZGdlRGlzdGFu Y2VUaHJlYXNob2xkLndpZHRoICogMC4xOworICAgIGVkZ2VEaXN0YW5jZVRocmVhc2hvbGQuaGVp Z2h0ID0gZWRnZURpc3RhbmNlVGhyZWFzaG9sZC5oZWlnaHQgKiAwLjE7CiAgICAgZmxvYXQgc2Ny ZWVuTGVmdEVkZ2UgPSBzY3JlZW5SZWN0LngoKTsKLSAgICBmbG9hdCBpbnNldFNjcmVlbkxlZnRF ZGdlID0gc2NyZWVuTGVmdEVkZ2UgKyBFREdFX0RJU1RBTkNFX1RIUkVTSE9MRDsKKyAgICBmbG9h dCBpbnNldFNjcmVlbkxlZnRFZGdlID0gc2NyZWVuTGVmdEVkZ2UgKyBlZGdlRGlzdGFuY2VUaHJl YXNob2xkLndpZHRoOwogICAgIGZsb2F0IHNjcmVlblJpZ2h0RWRnZSA9IHNjcmVlblJlY3QubWF4 WCgpOwotICAgIGZsb2F0IGluc2V0U2NyZWVuUmlnaHRFZGdlID0gc2NyZWVuUmlnaHRFZGdlIC0g RURHRV9ESVNUQU5DRV9USFJFU0hPTEQ7CisgICAgZmxvYXQgaW5zZXRTY3JlZW5SaWdodEVkZ2Ug PSBzY3JlZW5SaWdodEVkZ2UgLSBlZGdlRGlzdGFuY2VUaHJlYXNob2xkLndpZHRoOwogICAgIGlm IChzY3JlZW5Qb2ludC54KCkgPj0gc2NyZWVuTGVmdEVkZ2UgJiYgc2NyZWVuUG9pbnQueCgpIDwg aW5zZXRTY3JlZW5MZWZ0RWRnZSkgewotICAgICAgICBmbG9hdCBkaXN0YW5jZUZyb21FZGdlID0g c2NyZWVuUG9pbnQueCgpIC0gc2NyZWVuTGVmdEVkZ2UgLSBFREdFX0RJU1RBTkNFX1RIUkVTSE9M RDsKKyAgICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IHNjcmVlblBvaW50LngoKSAtIHNj cmVlbkxlZnRFZGdlIC0gZWRnZURpc3RhbmNlVGhyZWFzaG9sZC53aWR0aDsKICAgICAgICAgaWYg KGRpc3RhbmNlRnJvbUVkZ2UgPCAwKQotICAgICAgICAgICAgYWRqdXN0bWVudEZhY3Rvci5zZXRX aWR0aCgtRURHRV9ESVNUQU5DRV9USFJFU0hPTEQpOworICAgICAgICAgICAgYWRqdXN0bWVudEZh Y3Rvci5zZXRXaWR0aCgtZWRnZURpc3RhbmNlVGhyZWFzaG9sZC53aWR0aCk7CiAgICAgfSBlbHNl IGlmIChzY3JlZW5Qb2ludC54KCkgPj0gaW5zZXRTY3JlZW5SaWdodEVkZ2UgJiYgc2NyZWVuUG9p bnQueCgpIDwgc2NyZWVuUmlnaHRFZGdlKSB7Ci0gICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVk Z2UgPSBFREdFX0RJU1RBTkNFX1RIUkVTSE9MRCAtIChzY3JlZW5SaWdodEVkZ2UgLSBzY3JlZW5Q b2ludC54KCkpOworICAgICAgICBmbG9hdCBkaXN0YW5jZUZyb21FZGdlID0gZWRnZURpc3RhbmNl VGhyZWFzaG9sZC53aWR0aCAtIChzY3JlZW5SaWdodEVkZ2UgLSBzY3JlZW5Qb2ludC54KCkpOwog ICAgICAgICBpZiAoZGlzdGFuY2VGcm9tRWRnZSA+IDApCi0gICAgICAgICAgICBhZGp1c3RtZW50 RmFjdG9yLnNldFdpZHRoKEVER0VfRElTVEFOQ0VfVEhSRVNIT0xEKTsKKyAgICAgICAgICAgIGFk anVzdG1lbnRGYWN0b3Iuc2V0V2lkdGgoZWRnZURpc3RhbmNlVGhyZWFzaG9sZC53aWR0aCk7CiAg ICAgfQogICAgIAogICAgIGZsb2F0IHNjcmVlblRvcEVkZ2UgPSBzY3JlZW5SZWN0LnkoKTsKLSAg ICBmbG9hdCBpbnNldFNjcmVlblRvcEVkZ2UgPSBzY3JlZW5Ub3BFZGdlICsgRURHRV9ESVNUQU5D RV9USFJFU0hPTEQ7CisgICAgZmxvYXQgaW5zZXRTY3JlZW5Ub3BFZGdlID0gc2NyZWVuVG9wRWRn ZSArIGVkZ2VEaXN0YW5jZVRocmVhc2hvbGQuaGVpZ2h0OwogICAgIGZsb2F0IHNjcmVlbkJvdHRv bUVkZ2UgPSBzY3JlZW5SZWN0Lm1heFkoKTsKLSAgICBmbG9hdCBpbnNldFNjcmVlbkJvdHRvbUVk Z2UgPSBzY3JlZW5Cb3R0b21FZGdlIC0gRURHRV9ESVNUQU5DRV9USFJFU0hPTEQ7CisgICAgZmxv YXQgaW5zZXRTY3JlZW5Cb3R0b21FZGdlID0gc2NyZWVuQm90dG9tRWRnZSAtIGVkZ2VEaXN0YW5j ZVRocmVhc2hvbGQuaGVpZ2h0OwogICAgIAogICAgIGlmIChzY3JlZW5Qb2ludC55KCkgPj0gc2Ny ZWVuVG9wRWRnZSAmJiBzY3JlZW5Qb2ludC55KCkgPCBpbnNldFNjcmVlblRvcEVkZ2UpIHsKLSAg ICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IHNjcmVlblBvaW50LnkoKSAtIHNjcmVlblRv cEVkZ2UgLSBFREdFX0RJU1RBTkNFX1RIUkVTSE9MRDsKKyAgICAgICAgZmxvYXQgZGlzdGFuY2VG cm9tRWRnZSA9IHNjcmVlblBvaW50LnkoKSAtIHNjcmVlblRvcEVkZ2UgLSBlZGdlRGlzdGFuY2VU aHJlYXNob2xkLmhlaWdodDsKICAgICAgICAgaWYgKGRpc3RhbmNlRnJvbUVkZ2UgPCAwKQotICAg ICAgICAgICAgYWRqdXN0bWVudEZhY3Rvci5zZXRIZWlnaHQoLUVER0VfRElTVEFOQ0VfVEhSRVNI T0xEKTsKKyAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0SGVpZ2h0KC1lZGdlRGlzdGFu Y2VUaHJlYXNob2xkLmhlaWdodCk7CiAgICAgfSBlbHNlIGlmIChzY3JlZW5Qb2ludC55KCkgPj0g aW5zZXRTY3JlZW5Cb3R0b21FZGdlICYmIHNjcmVlblBvaW50LnkoKSA8IHNjcmVlbkJvdHRvbUVk Z2UpIHsKLSAgICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IEVER0VfRElTVEFOQ0VfVEhS RVNIT0xEIC0gKHNjcmVlbkJvdHRvbUVkZ2UgLSBzY3JlZW5Qb2ludC55KCkpOworICAgICAgICBm bG9hdCBkaXN0YW5jZUZyb21FZGdlID0gZWRnZURpc3RhbmNlVGhyZWFzaG9sZC5oZWlnaHQgLSAo c2NyZWVuQm90dG9tRWRnZSAtIHNjcmVlblBvaW50LnkoKSk7CiAgICAgICAgIGlmIChkaXN0YW5j ZUZyb21FZGdlID4gMCkKLSAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0SGVpZ2h0KEVE R0VfRElTVEFOQ0VfVEhSRVNIT0xEKTsKKyAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0 SGVpZ2h0KGVkZ2VEaXN0YW5jZVRocmVhc2hvbGQuaGVpZ2h0KTsKICAgICB9CiAgICAgCiAgICAg cmV0dXJuIGFkanVzdG1lbnRGYWN0b3I7Cg== 345127 2018-07-16 16:07:16 -0700 2018-07-16 18:43:21 -0700 Patch bug-187673-20180716160715.patch text/plain 6450 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE0ZDY4MDk1NGU2YWZh ZjAyYTg1MzI3NjBhYzdiNjljZGUzMjc1NS4uNmIzNGNjYmFiMTMwNzA0YzRlZjU3ZWFkNjY2Mjdj ZDBlMWFlYmZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA3LTEzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdGx5 IGFkanVzdCBzY3JvbGwgb2Zmc2V0cyB3aGVuIGEgcGFnZSBpcyB6b29tZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzY3MworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDE3MTI4Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV3JpdGluZyBhIHRlc3Qgbm93LCBidXQgSSB3YW50IHRvIGdldCB0aGlz IHJldmlld2VkLgorCisgICAgICAgIEluc3RlYWQgb2YganVzdCBzZXR0aW5nIHRoZSBvZmZzZXQg YXJiaXRyYXJpbHkgdG8gMTAwLCB1c2UgdGhlIHNjcmVlbiByZWN0CisgICAgICAgIHRvIG1ha2Ug dGhlIG9mZnNldCB3aGVyZSB3ZSBzdGFydCB0byBhZGp1c3QgdGhlIHNjcm9sbCBwb3NpdGlvbiB0 byBiZSAxMCUgCisgICAgICAgIG9mIHRoZSBzY3JlZW4gcmVjdC4gVGhpcyB3aWxsIGtlZXAgdXMg ZnJvbSBvdmVyIHNjcm9sbGluZyBpbiByYW5kb20gZGlyZWN0aW9ucywKKyAgICAgICAgd2hpY2gg aXMgd2hhdCB3YXMgaGFwcGVuaW5nIGJlZm9yZS4KKworICAgICAgICAqIHBhZ2UvaW9zL0V2ZW50 SGFuZGxlcklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmF1dG9zY3JvbGxBZGp1c3RtZW50RmFj dG9yRm9yU2NyZWVuQm91bmRhcmllcyk6CisKIDIwMTgtMDctMTMgIENoYXJsaWUgVHVybmVyICA8 Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFVzZSBzbWFydCBwb2lu dGVycyBmb3IgR3N0Qnl0ZVJlYWRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9p b3MvRXZlbnRIYW5kbGVySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRXZlbnRIYW5k bGVySU9TLm1tCmluZGV4IDJlZmEyNTFlZTRiOTk1MmJlMjA5OTExN2RiYmY4ZWY1ODA3YWFhMzEu LmNjNzUzNzEyNzkzN2FhY2M4NTczOWRkMDVhODlmYzU5NWQyYzRjYmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9FdmVudEhhbmRsZXJJT1MubW0KQEAgLTU3OCw3ICs1NzgsNyBAQCB2b2lk IEV2ZW50SGFuZGxlcjo6Y2FuY2VsU2VsZWN0aW9uQXV0b3Njcm9sbCgpCiAgICAgbV9hdXRvc2Ny b2xsQ29udHJvbGxlci0+c3RvcEF1dG9zY3JvbGxUaW1lcigpOwogfQogCi1zdGF0aWMgSW50U2l6 ZSBhdXRvc2Nyb2xsQWRqdXN0bWVudEZhY3RvckZvclNjcmVlbkJvdW5kYXJpZXMoY29uc3QgSW50 UG9pbnQmIHNjcmVlblBvaW50LCBjb25zdCBGbG9hdFJlY3QmIHNjcmVlblJlY3QpCitzdGF0aWMg SW50U2l6ZSBhdXRvc2Nyb2xsQWRqdXN0bWVudEZhY3RvckZvclNjcmVlbkJvdW5kYXJpZXMoY29u c3QgSW50UG9pbnQmIGNvbnRlbnRQb3NpdGlvbiwgY29uc3QgRmxvYXRSZWN0JiB1bm9ic2N1cmVk Q29udGVudFJlY3QsIGZsb2F0IHpvb21GYWN0b3IpCiB7CiAgICAgLy8gSWYgdGhlIHdpbmRvdyBp cyBhdCB0aGUgZWRnZSBvZiB0aGUgc2NyZWVuLCBhbmQgdGhlIHRvdWNoIHBvc2l0aW9uIGlzIGFs c28gYXQgdGhhdCBlZGdlIG9mIHRoZSBzY3JlZW4sCiAgICAgLy8gd2UgbmVlZCB0byBhZGp1c3Qg dGhlIGF1dG9zY3JvbGwgYW1vdW50IGluIG9yZGVyIGZvciB0aGUgdXNlciB0byBiZSBhYmxlIHRv IGF1dG9zY3JvbGwgaW4gdGhhdCBkaXJlY3Rpb24uCkBAIC01OTAsMzMgKzU5MCwzNyBAQCBzdGF0 aWMgSW50U2l6ZSBhdXRvc2Nyb2xsQWRqdXN0bWVudEZhY3RvckZvclNjcmVlbkJvdW5kYXJpZXMo Y29uc3QgSW50UG9pbnQmIHNjcgogICAgIAogI2RlZmluZSBFREdFX0RJU1RBTkNFX1RIUkVTSE9M RCAxMDAKIAotICAgIGZsb2F0IHNjcmVlbkxlZnRFZGdlID0gc2NyZWVuUmVjdC54KCk7Ci0gICAg ZmxvYXQgaW5zZXRTY3JlZW5MZWZ0RWRnZSA9IHNjcmVlbkxlZnRFZGdlICsgRURHRV9ESVNUQU5D RV9USFJFU0hPTEQ7Ci0gICAgZmxvYXQgc2NyZWVuUmlnaHRFZGdlID0gc2NyZWVuUmVjdC5tYXhY KCk7Ci0gICAgZmxvYXQgaW5zZXRTY3JlZW5SaWdodEVkZ2UgPSBzY3JlZW5SaWdodEVkZ2UgLSBF REdFX0RJU1RBTkNFX1RIUkVTSE9MRDsKLSAgICBpZiAoc2NyZWVuUG9pbnQueCgpID49IHNjcmVl bkxlZnRFZGdlICYmIHNjcmVlblBvaW50LngoKSA8IGluc2V0U2NyZWVuTGVmdEVkZ2UpIHsKLSAg ICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IHNjcmVlblBvaW50LngoKSAtIHNjcmVlbkxl ZnRFZGdlIC0gRURHRV9ESVNUQU5DRV9USFJFU0hPTEQ7CisgICAgQ0dTaXplIGVkZ2VEaXN0YW5j ZVRocmVzaG9sZCA9IENHUmVjdCh1bm9ic2N1cmVkQ29udGVudFJlY3QpLnNpemU7CisgICAgZWRn ZURpc3RhbmNlVGhyZXNob2xkLndpZHRoID0gRURHRV9ESVNUQU5DRV9USFJFU0hPTEQgLyB6b29t RmFjdG9yOworICAgIGVkZ2VEaXN0YW5jZVRocmVzaG9sZC5oZWlnaHQgPSBFREdFX0RJU1RBTkNF X1RIUkVTSE9MRCAvIHpvb21GYWN0b3I7CisgICAgCisgICAgZmxvYXQgc2NyZWVuTGVmdEVkZ2Ug PSB1bm9ic2N1cmVkQ29udGVudFJlY3QueCgpOworICAgIGZsb2F0IGluc2V0U2NyZWVuTGVmdEVk Z2UgPSBzY3JlZW5MZWZ0RWRnZSArIGVkZ2VEaXN0YW5jZVRocmVzaG9sZC53aWR0aDsKKyAgICBm bG9hdCBzY3JlZW5SaWdodEVkZ2UgPSB1bm9ic2N1cmVkQ29udGVudFJlY3QubWF4WCgpOworICAg IGZsb2F0IGluc2V0U2NyZWVuUmlnaHRFZGdlID0gc2NyZWVuUmlnaHRFZGdlIC0gZWRnZURpc3Rh bmNlVGhyZXNob2xkLndpZHRoOworICAgIGlmIChjb250ZW50UG9zaXRpb24ueCgpID49IHNjcmVl bkxlZnRFZGdlICYmIGNvbnRlbnRQb3NpdGlvbi54KCkgPCBpbnNldFNjcmVlbkxlZnRFZGdlKSB7 CisgICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVkZ2UgPSBjb250ZW50UG9zaXRpb24ueCgpIC0g c2NyZWVuTGVmdEVkZ2UgLSBlZGdlRGlzdGFuY2VUaHJlc2hvbGQud2lkdGg7CiAgICAgICAgIGlm IChkaXN0YW5jZUZyb21FZGdlIDwgMCkKLSAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0 V2lkdGgoLUVER0VfRElTVEFOQ0VfVEhSRVNIT0xEKTsKLSAgICB9IGVsc2UgaWYgKHNjcmVlblBv aW50LngoKSA+PSBpbnNldFNjcmVlblJpZ2h0RWRnZSAmJiBzY3JlZW5Qb2ludC54KCkgPCBzY3Jl ZW5SaWdodEVkZ2UpIHsKLSAgICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IEVER0VfRElT VEFOQ0VfVEhSRVNIT0xEIC0gKHNjcmVlblJpZ2h0RWRnZSAtIHNjcmVlblBvaW50LngoKSk7Cisg ICAgICAgICAgICBhZGp1c3RtZW50RmFjdG9yLnNldFdpZHRoKC1lZGdlRGlzdGFuY2VUaHJlc2hv bGQud2lkdGgpOworICAgIH0gZWxzZSBpZiAoY29udGVudFBvc2l0aW9uLngoKSA+PSBpbnNldFNj cmVlblJpZ2h0RWRnZSAmJiBjb250ZW50UG9zaXRpb24ueCgpIDwgc2NyZWVuUmlnaHRFZGdlKSB7 CisgICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVkZ2UgPSBlZGdlRGlzdGFuY2VUaHJlc2hvbGQu d2lkdGggLSAoc2NyZWVuUmlnaHRFZGdlIC0gY29udGVudFBvc2l0aW9uLngoKSk7CiAgICAgICAg IGlmIChkaXN0YW5jZUZyb21FZGdlID4gMCkKLSAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iu c2V0V2lkdGgoRURHRV9ESVNUQU5DRV9USFJFU0hPTEQpOworICAgICAgICAgICAgYWRqdXN0bWVu dEZhY3Rvci5zZXRXaWR0aChlZGdlRGlzdGFuY2VUaHJlc2hvbGQud2lkdGgpOwogICAgIH0KICAg ICAKLSAgICBmbG9hdCBzY3JlZW5Ub3BFZGdlID0gc2NyZWVuUmVjdC55KCk7Ci0gICAgZmxvYXQg aW5zZXRTY3JlZW5Ub3BFZGdlID0gc2NyZWVuVG9wRWRnZSArIEVER0VfRElTVEFOQ0VfVEhSRVNI T0xEOwotICAgIGZsb2F0IHNjcmVlbkJvdHRvbUVkZ2UgPSBzY3JlZW5SZWN0Lm1heFkoKTsKLSAg ICBmbG9hdCBpbnNldFNjcmVlbkJvdHRvbUVkZ2UgPSBzY3JlZW5Cb3R0b21FZGdlIC0gRURHRV9E SVNUQU5DRV9USFJFU0hPTEQ7CisgICAgZmxvYXQgc2NyZWVuVG9wRWRnZSA9IHVub2JzY3VyZWRD b250ZW50UmVjdC55KCk7CisgICAgZmxvYXQgaW5zZXRTY3JlZW5Ub3BFZGdlID0gc2NyZWVuVG9w RWRnZSArIGVkZ2VEaXN0YW5jZVRocmVzaG9sZC5oZWlnaHQ7CisgICAgZmxvYXQgc2NyZWVuQm90 dG9tRWRnZSA9IHVub2JzY3VyZWRDb250ZW50UmVjdC5tYXhZKCk7CisgICAgZmxvYXQgaW5zZXRT Y3JlZW5Cb3R0b21FZGdlID0gc2NyZWVuQm90dG9tRWRnZSAtIGVkZ2VEaXN0YW5jZVRocmVzaG9s ZC5oZWlnaHQ7CiAgICAgCi0gICAgaWYgKHNjcmVlblBvaW50LnkoKSA+PSBzY3JlZW5Ub3BFZGdl ICYmIHNjcmVlblBvaW50LnkoKSA8IGluc2V0U2NyZWVuVG9wRWRnZSkgewotICAgICAgICBmbG9h dCBkaXN0YW5jZUZyb21FZGdlID0gc2NyZWVuUG9pbnQueSgpIC0gc2NyZWVuVG9wRWRnZSAtIEVE R0VfRElTVEFOQ0VfVEhSRVNIT0xEOworICAgIGlmIChjb250ZW50UG9zaXRpb24ueSgpID49IHNj cmVlblRvcEVkZ2UgJiYgY29udGVudFBvc2l0aW9uLnkoKSA8IGluc2V0U2NyZWVuVG9wRWRnZSkg eworICAgICAgICBmbG9hdCBkaXN0YW5jZUZyb21FZGdlID0gY29udGVudFBvc2l0aW9uLnkoKSAt IHNjcmVlblRvcEVkZ2UgLSBlZGdlRGlzdGFuY2VUaHJlc2hvbGQuaGVpZ2h0OwogICAgICAgICBp ZiAoZGlzdGFuY2VGcm9tRWRnZSA8IDApCi0gICAgICAgICAgICBhZGp1c3RtZW50RmFjdG9yLnNl dEhlaWdodCgtRURHRV9ESVNUQU5DRV9USFJFU0hPTEQpOwotICAgIH0gZWxzZSBpZiAoc2NyZWVu UG9pbnQueSgpID49IGluc2V0U2NyZWVuQm90dG9tRWRnZSAmJiBzY3JlZW5Qb2ludC55KCkgPCBz Y3JlZW5Cb3R0b21FZGdlKSB7Ci0gICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVkZ2UgPSBFREdF X0RJU1RBTkNFX1RIUkVTSE9MRCAtIChzY3JlZW5Cb3R0b21FZGdlIC0gc2NyZWVuUG9pbnQueSgp KTsKKyAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0SGVpZ2h0KC1lZGdlRGlzdGFuY2VU aHJlc2hvbGQuaGVpZ2h0KTsKKyAgICB9IGVsc2UgaWYgKGNvbnRlbnRQb3NpdGlvbi55KCkgPj0g aW5zZXRTY3JlZW5Cb3R0b21FZGdlICYmIGNvbnRlbnRQb3NpdGlvbi55KCkgPCBzY3JlZW5Cb3R0 b21FZGdlKSB7CisgICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVkZ2UgPSBlZGdlRGlzdGFuY2VU aHJlc2hvbGQuaGVpZ2h0IC0gKHNjcmVlbkJvdHRvbUVkZ2UgLSBjb250ZW50UG9zaXRpb24ueSgp KTsKICAgICAgICAgaWYgKGRpc3RhbmNlRnJvbUVkZ2UgPiAwKQotICAgICAgICAgICAgYWRqdXN0 bWVudEZhY3Rvci5zZXRIZWlnaHQoRURHRV9ESVNUQU5DRV9USFJFU0hPTEQpOworICAgICAgICAg ICAgYWRqdXN0bWVudEZhY3Rvci5zZXRIZWlnaHQoZWRnZURpc3RhbmNlVGhyZXNob2xkLmhlaWdo dCk7CiAgICAgfQogICAgIAogICAgIHJldHVybiBhZGp1c3RtZW50RmFjdG9yOwpAQCAtNjMwLDcg KzYzNCw3IEBAIEludFBvaW50IEV2ZW50SGFuZGxlcjo6dGFyZ2V0UG9zaXRpb25JbldpbmRvd0Zv clNlbGVjdGlvbkF1dG9zY3JvbGwoKSBjb25zdAogICAgIAogICAgIC8vIE1hbnVhbGx5IG5lZWQg dG8gY29udmVydCB2aWV3VG9Db250ZW50cywgYXMgaXQgd2lsbCBiZSBza2lwcGVkIGJlY2F1c2Ug ZGVsZWdhdGVkU2Nyb2xsaW5nIGlzIG9uIGlPUwogICAgIEludFBvaW50IGNvbnRlbnRQb3NpdGlv biA9IHByb3RlY3RlZEZyYW1lLT52aWV3KCktPnZpZXdUb0NvbnRlbnRzKHByb3RlY3RlZEZyYW1l LT52aWV3KCktPmNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyhtX3RhcmdldEF1dG9zY3JvbGxQ b3NpdGlvbkluV2luZG93KSk7Ci0gICAgSW50U2l6ZSBhZGp1c3RQb3NpdGlvbiA9IGF1dG9zY3Jv bGxBZGp1c3RtZW50RmFjdG9yRm9yU2NyZWVuQm91bmRhcmllcyhjb250ZW50UG9zaXRpb24sIHVu b2JzY3VyZWRDb250ZW50UmVjdCk7CisgICAgSW50U2l6ZSBhZGp1c3RQb3NpdGlvbiA9IGF1dG9z Y3JvbGxBZGp1c3RtZW50RmFjdG9yRm9yU2NyZWVuQm91bmRhcmllcyhjb250ZW50UG9zaXRpb24s IHVub2JzY3VyZWRDb250ZW50UmVjdCwgcHJvdGVjdGVkRnJhbWUtPnBhZ2UoKS0+cGFnZVNjYWxl RmFjdG9yKCkpOwogICAgIHJldHVybiBjb250ZW50UG9zaXRpb24gKyBhZGp1c3RQb3NpdGlvbjsK IH0KICAgICAK 345135 2018-07-16 18:43:23 -0700 2018-07-16 21:44:29 -0700 Patch for landing bug-187673-20180716184322.patch text/plain 6149 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUyYjc3NjliMGFmMDQz ZTU3ZDJiNWJhYjMyMzQ2NjQyZWZhZWZiYS4uNzAzOGZmNTk2N2E5NTRkMzc1YzBlYzUyMGY5ZGRl OTgzOTEwNDgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA3LTEzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29ycmVjdGx5 IGFkanVzdCBzY3JvbGwgb2Zmc2V0cyB3aGVuIGEgcGFnZSBpcyB6b29tZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzY3MworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDE3MTI4Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFdpbGwgYWRkIHRlc3QgbGF0ZXIuCisKKyAgICAgICAgTWFrZSBzdXJlIHRo YXQgZGlzdGFuY2UgaXMgc2NhbGVkIGJ5IHRoZSBwYWdlU2NhbGVGYWN0b3IsIHRvIAorICAgICAg ICBtYWtlIHN1cmUgdGhhdCB3ZSBzY3JvbGwgY29ycmVjdGx5IHdoZW4gd2UgYXJlIHpvb21lZCBp bi4KKworICAgICAgICAqIHBhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbToKKyAgICAgICAgKFdl YkNvcmU6OmF1dG9zY3JvbGxBZGp1c3RtZW50RmFjdG9yRm9yU2NyZWVuQm91bmRhcmllcyk6Cisg ICAgICAgIAogMjAxOC0wNy0xNiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeCBmb3IgcjIzMzg3My4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbQppbmRleCAyZWZhMjUxZWU0Yjk5NTJiZTIw OTkxMTdkYmJmOGVmNTgwN2FhYTMxLi40OTZmOTJhNWVlM2YwNWFlN2QzMDQxZmI0ZWQxOTQwMGE5 N2NjZjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9FdmVudEhhbmRsZXJJ T1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRXZlbnRIYW5kbGVySU9TLm1tCkBA IC01NzgsNyArNTc4LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmNhbmNlbFNlbGVjdGlvbkF1dG9z Y3JvbGwoKQogICAgIG1fYXV0b3Njcm9sbENvbnRyb2xsZXItPnN0b3BBdXRvc2Nyb2xsVGltZXIo KTsKIH0KIAotc3RhdGljIEludFNpemUgYXV0b3Njcm9sbEFkanVzdG1lbnRGYWN0b3JGb3JTY3Jl ZW5Cb3VuZGFyaWVzKGNvbnN0IEludFBvaW50JiBzY3JlZW5Qb2ludCwgY29uc3QgRmxvYXRSZWN0 JiBzY3JlZW5SZWN0KQorc3RhdGljIEludFNpemUgYXV0b3Njcm9sbEFkanVzdG1lbnRGYWN0b3JG b3JTY3JlZW5Cb3VuZGFyaWVzKGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zaXRpb24sIGNvbnN0 IEZsb2F0UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0LCBmbG9hdCB6b29tRmFjdG9yKQogewog ICAgIC8vIElmIHRoZSB3aW5kb3cgaXMgYXQgdGhlIGVkZ2Ugb2YgdGhlIHNjcmVlbiwgYW5kIHRo ZSB0b3VjaCBwb3NpdGlvbiBpcyBhbHNvIGF0IHRoYXQgZWRnZSBvZiB0aGUgc2NyZWVuLAogICAg IC8vIHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBhdXRvc2Nyb2xsIGFtb3VudCBpbiBvcmRlciBmb3Ig dGhlIHVzZXIgdG8gYmUgYWJsZSB0byBhdXRvc2Nyb2xsIGluIHRoYXQgZGlyZWN0aW9uLgpAQCAt NTkwLDMzICs1OTAsMzUgQEAgc3RhdGljIEludFNpemUgYXV0b3Njcm9sbEFkanVzdG1lbnRGYWN0 b3JGb3JTY3JlZW5Cb3VuZGFyaWVzKGNvbnN0IEludFBvaW50JiBzY3IKICAgICAKICNkZWZpbmUg RURHRV9ESVNUQU5DRV9USFJFU0hPTEQgMTAwCiAKLSAgICBmbG9hdCBzY3JlZW5MZWZ0RWRnZSA9 IHNjcmVlblJlY3QueCgpOwotICAgIGZsb2F0IGluc2V0U2NyZWVuTGVmdEVkZ2UgPSBzY3JlZW5M ZWZ0RWRnZSArIEVER0VfRElTVEFOQ0VfVEhSRVNIT0xEOwotICAgIGZsb2F0IHNjcmVlblJpZ2h0 RWRnZSA9IHNjcmVlblJlY3QubWF4WCgpOwotICAgIGZsb2F0IGluc2V0U2NyZWVuUmlnaHRFZGdl ID0gc2NyZWVuUmlnaHRFZGdlIC0gRURHRV9ESVNUQU5DRV9USFJFU0hPTEQ7Ci0gICAgaWYgKHNj cmVlblBvaW50LngoKSA+PSBzY3JlZW5MZWZ0RWRnZSAmJiBzY3JlZW5Qb2ludC54KCkgPCBpbnNl dFNjcmVlbkxlZnRFZGdlKSB7Ci0gICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVkZ2UgPSBzY3Jl ZW5Qb2ludC54KCkgLSBzY3JlZW5MZWZ0RWRnZSAtIEVER0VfRElTVEFOQ0VfVEhSRVNIT0xEOwor ICAgIENHU2l6ZSBlZGdlRGlzdGFuY2VUaHJlc2hvbGQgPSBDR1NpemVNYWtlKEVER0VfRElTVEFO Q0VfVEhSRVNIT0xEIC8gem9vbUZhY3RvciwgRURHRV9ESVNUQU5DRV9USFJFU0hPTEQgLyB6b29t RmFjdG9yKTsKKyAgICAKKyAgICBmbG9hdCBzY3JlZW5MZWZ0RWRnZSA9IHVub2JzY3VyZWRDb250 ZW50UmVjdC54KCk7CisgICAgZmxvYXQgaW5zZXRTY3JlZW5MZWZ0RWRnZSA9IHNjcmVlbkxlZnRF ZGdlICsgZWRnZURpc3RhbmNlVGhyZXNob2xkLndpZHRoOworICAgIGZsb2F0IHNjcmVlblJpZ2h0 RWRnZSA9IHVub2JzY3VyZWRDb250ZW50UmVjdC5tYXhYKCk7CisgICAgZmxvYXQgaW5zZXRTY3Jl ZW5SaWdodEVkZ2UgPSBzY3JlZW5SaWdodEVkZ2UgLSBlZGdlRGlzdGFuY2VUaHJlc2hvbGQud2lk dGg7CisgICAgaWYgKGNvbnRlbnRQb3NpdGlvbi54KCkgPj0gc2NyZWVuTGVmdEVkZ2UgJiYgY29u dGVudFBvc2l0aW9uLngoKSA8IGluc2V0U2NyZWVuTGVmdEVkZ2UpIHsKKyAgICAgICAgZmxvYXQg ZGlzdGFuY2VGcm9tRWRnZSA9IGNvbnRlbnRQb3NpdGlvbi54KCkgLSBzY3JlZW5MZWZ0RWRnZSAt IGVkZ2VEaXN0YW5jZVRocmVzaG9sZC53aWR0aDsKICAgICAgICAgaWYgKGRpc3RhbmNlRnJvbUVk Z2UgPCAwKQotICAgICAgICAgICAgYWRqdXN0bWVudEZhY3Rvci5zZXRXaWR0aCgtRURHRV9ESVNU QU5DRV9USFJFU0hPTEQpOwotICAgIH0gZWxzZSBpZiAoc2NyZWVuUG9pbnQueCgpID49IGluc2V0 U2NyZWVuUmlnaHRFZGdlICYmIHNjcmVlblBvaW50LngoKSA8IHNjcmVlblJpZ2h0RWRnZSkgewot ICAgICAgICBmbG9hdCBkaXN0YW5jZUZyb21FZGdlID0gRURHRV9ESVNUQU5DRV9USFJFU0hPTEQg LSAoc2NyZWVuUmlnaHRFZGdlIC0gc2NyZWVuUG9pbnQueCgpKTsKKyAgICAgICAgICAgIGFkanVz dG1lbnRGYWN0b3Iuc2V0V2lkdGgoLWVkZ2VEaXN0YW5jZVRocmVzaG9sZC53aWR0aCk7CisgICAg fSBlbHNlIGlmIChjb250ZW50UG9zaXRpb24ueCgpID49IGluc2V0U2NyZWVuUmlnaHRFZGdlICYm IGNvbnRlbnRQb3NpdGlvbi54KCkgPCBzY3JlZW5SaWdodEVkZ2UpIHsKKyAgICAgICAgZmxvYXQg ZGlzdGFuY2VGcm9tRWRnZSA9IGVkZ2VEaXN0YW5jZVRocmVzaG9sZC53aWR0aCAtIChzY3JlZW5S aWdodEVkZ2UgLSBjb250ZW50UG9zaXRpb24ueCgpKTsKICAgICAgICAgaWYgKGRpc3RhbmNlRnJv bUVkZ2UgPiAwKQotICAgICAgICAgICAgYWRqdXN0bWVudEZhY3Rvci5zZXRXaWR0aChFREdFX0RJ U1RBTkNFX1RIUkVTSE9MRCk7CisgICAgICAgICAgICBhZGp1c3RtZW50RmFjdG9yLnNldFdpZHRo KGVkZ2VEaXN0YW5jZVRocmVzaG9sZC53aWR0aCk7CiAgICAgfQogICAgIAotICAgIGZsb2F0IHNj cmVlblRvcEVkZ2UgPSBzY3JlZW5SZWN0LnkoKTsKLSAgICBmbG9hdCBpbnNldFNjcmVlblRvcEVk Z2UgPSBzY3JlZW5Ub3BFZGdlICsgRURHRV9ESVNUQU5DRV9USFJFU0hPTEQ7Ci0gICAgZmxvYXQg c2NyZWVuQm90dG9tRWRnZSA9IHNjcmVlblJlY3QubWF4WSgpOwotICAgIGZsb2F0IGluc2V0U2Ny ZWVuQm90dG9tRWRnZSA9IHNjcmVlbkJvdHRvbUVkZ2UgLSBFREdFX0RJU1RBTkNFX1RIUkVTSE9M RDsKKyAgICBmbG9hdCBzY3JlZW5Ub3BFZGdlID0gdW5vYnNjdXJlZENvbnRlbnRSZWN0LnkoKTsK KyAgICBmbG9hdCBpbnNldFNjcmVlblRvcEVkZ2UgPSBzY3JlZW5Ub3BFZGdlICsgZWRnZURpc3Rh bmNlVGhyZXNob2xkLmhlaWdodDsKKyAgICBmbG9hdCBzY3JlZW5Cb3R0b21FZGdlID0gdW5vYnNj dXJlZENvbnRlbnRSZWN0Lm1heFkoKTsKKyAgICBmbG9hdCBpbnNldFNjcmVlbkJvdHRvbUVkZ2Ug PSBzY3JlZW5Cb3R0b21FZGdlIC0gZWRnZURpc3RhbmNlVGhyZXNob2xkLmhlaWdodDsKICAgICAK LSAgICBpZiAoc2NyZWVuUG9pbnQueSgpID49IHNjcmVlblRvcEVkZ2UgJiYgc2NyZWVuUG9pbnQu eSgpIDwgaW5zZXRTY3JlZW5Ub3BFZGdlKSB7Ci0gICAgICAgIGZsb2F0IGRpc3RhbmNlRnJvbUVk Z2UgPSBzY3JlZW5Qb2ludC55KCkgLSBzY3JlZW5Ub3BFZGdlIC0gRURHRV9ESVNUQU5DRV9USFJF U0hPTEQ7CisgICAgaWYgKGNvbnRlbnRQb3NpdGlvbi55KCkgPj0gc2NyZWVuVG9wRWRnZSAmJiBj b250ZW50UG9zaXRpb24ueSgpIDwgaW5zZXRTY3JlZW5Ub3BFZGdlKSB7CisgICAgICAgIGZsb2F0 IGRpc3RhbmNlRnJvbUVkZ2UgPSBjb250ZW50UG9zaXRpb24ueSgpIC0gc2NyZWVuVG9wRWRnZSAt IGVkZ2VEaXN0YW5jZVRocmVzaG9sZC5oZWlnaHQ7CiAgICAgICAgIGlmIChkaXN0YW5jZUZyb21F ZGdlIDwgMCkKLSAgICAgICAgICAgIGFkanVzdG1lbnRGYWN0b3Iuc2V0SGVpZ2h0KC1FREdFX0RJ U1RBTkNFX1RIUkVTSE9MRCk7Ci0gICAgfSBlbHNlIGlmIChzY3JlZW5Qb2ludC55KCkgPj0gaW5z ZXRTY3JlZW5Cb3R0b21FZGdlICYmIHNjcmVlblBvaW50LnkoKSA8IHNjcmVlbkJvdHRvbUVkZ2Up IHsKLSAgICAgICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IEVER0VfRElTVEFOQ0VfVEhSRVNI T0xEIC0gKHNjcmVlbkJvdHRvbUVkZ2UgLSBzY3JlZW5Qb2ludC55KCkpOworICAgICAgICAgICAg YWRqdXN0bWVudEZhY3Rvci5zZXRIZWlnaHQoLWVkZ2VEaXN0YW5jZVRocmVzaG9sZC5oZWlnaHQp OworICAgIH0gZWxzZSBpZiAoY29udGVudFBvc2l0aW9uLnkoKSA+PSBpbnNldFNjcmVlbkJvdHRv bUVkZ2UgJiYgY29udGVudFBvc2l0aW9uLnkoKSA8IHNjcmVlbkJvdHRvbUVkZ2UpIHsKKyAgICAg ICAgZmxvYXQgZGlzdGFuY2VGcm9tRWRnZSA9IGVkZ2VEaXN0YW5jZVRocmVzaG9sZC5oZWlnaHQg LSAoc2NyZWVuQm90dG9tRWRnZSAtIGNvbnRlbnRQb3NpdGlvbi55KCkpOwogICAgICAgICBpZiAo ZGlzdGFuY2VGcm9tRWRnZSA+IDApCi0gICAgICAgICAgICBhZGp1c3RtZW50RmFjdG9yLnNldEhl aWdodChFREdFX0RJU1RBTkNFX1RIUkVTSE9MRCk7CisgICAgICAgICAgICBhZGp1c3RtZW50RmFj dG9yLnNldEhlaWdodChlZGdlRGlzdGFuY2VUaHJlc2hvbGQuaGVpZ2h0KTsKICAgICB9CiAgICAg CiAgICAgcmV0dXJuIGFkanVzdG1lbnRGYWN0b3I7CkBAIC02MzAsNyArNjMyLDcgQEAgSW50UG9p bnQgRXZlbnRIYW5kbGVyOjp0YXJnZXRQb3NpdGlvbkluV2luZG93Rm9yU2VsZWN0aW9uQXV0b3Nj cm9sbCgpIGNvbnN0CiAgICAgCiAgICAgLy8gTWFudWFsbHkgbmVlZCB0byBjb252ZXJ0IHZpZXdU b0NvbnRlbnRzLCBhcyBpdCB3aWxsIGJlIHNraXBwZWQgYmVjYXVzZSBkZWxlZ2F0ZWRTY3JvbGxp bmcgaXMgb24gaU9TCiAgICAgSW50UG9pbnQgY29udGVudFBvc2l0aW9uID0gcHJvdGVjdGVkRnJh bWUtPnZpZXcoKS0+dmlld1RvQ29udGVudHMocHJvdGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29udmVy dEZyb21Db250YWluaW5nV2luZG93KG1fdGFyZ2V0QXV0b3Njcm9sbFBvc2l0aW9uSW5XaW5kb3cp KTsKLSAgICBJbnRTaXplIGFkanVzdFBvc2l0aW9uID0gYXV0b3Njcm9sbEFkanVzdG1lbnRGYWN0 b3JGb3JTY3JlZW5Cb3VuZGFyaWVzKGNvbnRlbnRQb3NpdGlvbiwgdW5vYnNjdXJlZENvbnRlbnRS ZWN0KTsKKyAgICBJbnRTaXplIGFkanVzdFBvc2l0aW9uID0gYXV0b3Njcm9sbEFkanVzdG1lbnRG YWN0b3JGb3JTY3JlZW5Cb3VuZGFyaWVzKGNvbnRlbnRQb3NpdGlvbiwgdW5vYnNjdXJlZENvbnRl bnRSZWN0LCBwcm90ZWN0ZWRGcmFtZS0+cGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAg cmV0dXJuIGNvbnRlbnRQb3NpdGlvbiArIGFkanVzdFBvc2l0aW9uOwogfQogICAgIAo=