211494 2020-05-05 22:04:32 -0700 Factor EventHandler code that sends mouseEnteredContentArea/mouseExitedContentArea into its own function 2020-05-06 08:31:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser koivisto simon.fraser webkit-bug-importer oldest_to_newest 1649496 0 simon.fraser 2020-05-05 22:04:32 -0700 Factor EventHandler code that sends mouseEnteredContentArea/mouseExitedContentArea into its own function 1649497 1 398588 simon.fraser 2020-05-05 22:06:38 -0700 Created attachment 398588 Patch 1649508 2 398593 simon.fraser 2020-05-05 22:40:28 -0700 Created attachment 398593 Patch 1649602 3 398593 koivisto 2020-05-06 07:56:28 -0700 Comment on attachment 398593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398593&action=review > Source/WebCore/page/EventHandler.cpp:2627 > + if (elementUnderMouse) { > + frameView->mouseEnteredContentArea(); > + if (scrollableAreaForNodeUnderMouse) > + scrollableAreaForNodeUnderMouse->mouseEnteredContentArea(); > + } else { > + if (scrollableAreaForLastNode) > + scrollableAreaForLastNode->mouseExitedContentArea(); > + frameView->mouseExitedContentArea(); > + } > + return; You could early return instead of the else branch. 1649625 4 ews-feeder 2020-05-06 08:30:20 -0700 Committed r261229: <https://trac.webkit.org/changeset/261229> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398593. 1649626 5 webkit-bug-importer 2020-05-06 08:31:16 -0700 <rdar://problem/62931618> 398588 2020-05-05 22:06:38 -0700 2020-05-05 22:40:26 -0700 Patch bug-211494-20200505220637.patch text/plain 6178 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJkOWE2MzkyZGQ0NGMz NTg2MzBkZTBmNTZkNGIwMTE2N2ZkNzJiYS4uYThiOGY1MjZmNDg2N2Q2MDZlYjZlYzAyY2YyZTYw MjllYjgyZjZhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA1LTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZhY3RvciBFdmVu dEhhbmRsZXIgY29kZSB0aGF0IHNlbmRzIG1vdXNlRW50ZXJlZENvbnRlbnRBcmVhL21vdXNlRXhp dGVkQ29udGVudEFyZWEgaW50byBpdHMgb3duIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0OTQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtb3VzZUVudGVyZWRDb250ZW50QXJlYS9tb3Vz ZUVudGVyZWRDb250ZW50QXJlYSBhcmUgdXNlZCBvbmx5IHRvIG5vdGlmeSBvdmVybGF5IHNjcm9s bGJhcnMKKyAgICAgICAgb2Ygc3RhdGUgY2hhbmdlcy4gRmFjdG9yIHRoZSBjb2RlIHRoYXQgY2Fs bHMgdGhlc2UgZnVuY3Rpb25zIGludG8gYSBzZXBhcmF0ZSBFdmVudEhhbmRsZXIKKyAgICAgICAg ZnVuY3Rpb24sIGFuZCByZWZhY3RvciBpdCBmb3IgY2xhcml0eSwgbm93IHdlIGtub3cgdGhhdCBi b3RoIGxhc3RFbGVtZW50VW5kZXJNb3VzZSBhbmQgZWxlbWVudFVuZGVyTW91c2UKKyAgICAgICAg bXVzdCBiZWxvbmcgdG8gdGhpcyBFdmVudEhhbmRsZXIncyBGcmFtZSdzIERvY3VtZW50LgorCisg ICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI YW5kbGVyOjp1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6Om5vdGlmeVNjcm9sbGFibGVBcmVhc09mTW91c2VFbnRlckV4aXQpOgorICAg ICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmg6CisKIDIwMjAtMDUtMDUgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRXZlbnRIYW5kbGVyOjpkaXNwYXRj aE1vdXNlRXZlbnQoKSBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5k ZXggNzQyNmQzZTZhODZlZmM3M2JlYjQwMGExZWRkZDdkMzBmZTNlYTA3OS4uOWUyNjZiY2M1MzRm MjBmNjNiNzQyNDdiMjUzNDFmN2ZhZmM3MjNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5k bGVyLmNwcApAQCAtMjU0OCw0MSArMjU0OCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjp1cGRhdGVN b3VzZUV2ZW50VGFyZ2V0Tm9kZShOb2RlKiB0YXJnZXROb2RlLCBjb25zdCBQbGF0Zm9ybU1vCiAK ICAgICAvLyBGaXJlIG1vdXNlb3V0L21vdXNlb3ZlciBpZiB0aGUgbW91c2UgaGFzIHNoaWZ0ZWQg dG8gYSBkaWZmZXJlbnQgbm9kZS4KICAgICBpZiAoZmlyZU1vdXNlT3Zlck91dCA9PSBGaXJlTW91 c2VPdmVyT3V0OjpZZXMpIHsKLSAgICAgICAgYXV0byBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2Rl ID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEobV9sYXN0RWxlbWVudFVuZGVyTW91c2UuZ2V0KCkp OwotICAgICAgICBhdXRvIHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgPSBlbmNsb3Np bmdTY3JvbGxhYmxlQXJlYShtX2VsZW1lbnRVbmRlck1vdXNlLmdldCgpKTsKLSAgICAgICAgUGFn ZSogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwotCi0gICAgICAgIGlmIChtX2xhc3RFbGVtZW50VW5k ZXJNb3VzZSAmJiAhbV9lbGVtZW50VW5kZXJNb3VzZSkgewotICAgICAgICAgICAgLy8gVGhlIG1v dXNlIGhhcyBtb3ZlZCBiZXR3ZWVuIGZyYW1lcy4KLSAgICAgICAgICAgIGlmIChGcmFtZSogZnJh bWUgPSBtX2xhc3RFbGVtZW50VW5kZXJNb3VzZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkKLSAg ICAgICAgICAgICAgICAgICAgZnJhbWVWaWV3LT5tb3VzZUV4aXRlZENvbnRlbnRBcmVhKCk7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAocGFnZSAmJiAoc2Nyb2xsYWJsZUFyZWFG b3JMYXN0Tm9kZSAmJiAoIXNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgfHwgc2Nyb2xs YWJsZUFyZWFGb3JOb2RlVW5kZXJNb3VzZSAhPSBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlKSkp IHsKLSAgICAgICAgICAgIC8vIFRoZSBtb3VzZSBoYXMgbW92ZWQgYmV0d2VlbiBsYXllcnMuCi0g ICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9sYXN0RWxlbWVudFVuZGVyTW91c2UtPmRv Y3VtZW50KCkuZnJhbWUoKSkgewotICAgICAgICAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1l VmlldyA9IGZyYW1lLT52aWV3KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lVmll dy0+Y29udGFpbnNTY3JvbGxhYmxlQXJlYShzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhRm9yTGFzdE5vZGUtPm1vdXNlRXhp dGVkQ29udGVudEFyZWEoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQotICAgICAgICBpZiAobV9lbGVtZW50VW5kZXJNb3VzZSAmJiAhbV9sYXN0RWxlbWVu dFVuZGVyTW91c2UpIHsKLSAgICAgICAgICAgIC8vIFRoZSBtb3VzZSBoYXMgbW92ZWQgYmV0d2Vl biBmcmFtZXMuCi0gICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9lbGVtZW50VW5kZXJN b3VzZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKEZyYW1lVmll dyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkKLSAgICAgICAgICAgICAgICAgICAgZnJhbWVW aWV3LT5tb3VzZUVudGVyZWRDb250ZW50QXJlYSgpOwotICAgICAgICAgICAgfQotICAgICAgICB9 IGVsc2UgaWYgKHBhZ2UgJiYgKHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgJiYgKCFz Y3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlIHx8IHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91 c2UgIT0gc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZSkpKSB7Ci0gICAgICAgICAgICAvLyBUaGUg bW91c2UgaGFzIG1vdmVkIGJldHdlZW4gbGF5ZXJzLgotICAgICAgICAgICAgaWYgKEZyYW1lKiBm cmFtZSA9IG1fZWxlbWVudFVuZGVyTW91c2UtPmRvY3VtZW50KCkuZnJhbWUoKSkgewotICAgICAg ICAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCkpIHsKLSAg ICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lVmlldy0+Y29udGFpbnNTY3JvbGxhYmxlQXJlYShz Y3JvbGxhYmxlQXJlYUZvck5vZGVVbmRlck1vdXNlKSkKLSAgICAgICAgICAgICAgICAgICAgICAg IHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UtPm1vdXNlRW50ZXJlZENvbnRlbnRBcmVh KCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAg IG5vdGlmeVNjcm9sbGFibGVBcmVhc09mTW91c2VFbnRlckV4aXQobV9sYXN0RWxlbWVudFVuZGVy TW91c2UuZ2V0KCksIG1fZWxlbWVudFVuZGVyTW91c2UuZ2V0KCkpOwogCiAgICAgICAgIGlmICht X2xhc3RFbGVtZW50VW5kZXJNb3VzZSAmJiAmbV9sYXN0RWxlbWVudFVuZGVyTW91c2UtPmRvY3Vt ZW50KCkgIT0gbV9mcmFtZS5kb2N1bWVudCgpKSB7CiAgICAgICAgICAgICBtX2xhc3RFbGVtZW50 VW5kZXJNb3VzZSA9IG51bGxwdHI7CkBAIC0yNjM5LDYgKzI2MDUsMzggQEAgdm9pZCBFdmVudEhh bmRsZXI6OnVwZGF0ZU1vdXNlRXZlbnRUYXJnZXROb2RlKE5vZGUqIHRhcmdldE5vZGUsIGNvbnN0 IFBsYXRmb3JtTW8KICAgICB9CiB9CiAKK3ZvaWQgRXZlbnRIYW5kbGVyOjpub3RpZnlTY3JvbGxh YmxlQXJlYXNPZk1vdXNlRW50ZXJFeGl0KEVsZW1lbnQqIGxhc3RFbGVtZW50VW5kZXJNb3VzZSwg RWxlbWVudCogZWxlbWVudFVuZGVyTW91c2UpCit7CisgICAgYXV0byogZnJhbWVWaWV3ID0gbV9m cmFtZS52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8gc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZSA9IGVuY2xvc2luZ1Njcm9sbGFibGVBcmVh KGxhc3RFbGVtZW50VW5kZXJNb3VzZSk7CisgICAgYXV0byBzY3JvbGxhYmxlQXJlYUZvck5vZGVV bmRlck1vdXNlID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEoZWxlbWVudFVuZGVyTW91c2UpOwor CisgICAgaWYgKCEhbGFzdEVsZW1lbnRVbmRlck1vdXNlKSAhPSAhIWVsZW1lbnRVbmRlck1vdXNl KSB7CisgICAgICAgIGlmIChlbGVtZW50VW5kZXJNb3VzZSkgeworICAgICAgICAgICAgZnJhbWVW aWV3LT5tb3VzZUVudGVyZWRDb250ZW50QXJlYSgpOworICAgICAgICAgICAgaWYgKHNjcm9sbGFi bGVBcmVhRm9yTm9kZVVuZGVyTW91c2UpCisgICAgICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWFG b3JOb2RlVW5kZXJNb3VzZS0+bW91c2VFbnRlcmVkQ29udGVudEFyZWEoKTsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIGlmIChzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlKQorICAgICAg ICAgICAgICAgIHNjcm9sbGFibGVBcmVhRm9yTGFzdE5vZGUtPm1vdXNlRXhpdGVkQ29udGVudEFy ZWEoKTsKKyAgICAgICAgICAgIGZyYW1lVmlldy0+bW91c2VFeGl0ZWRDb250ZW50QXJlYSgpOwor ICAgICAgICB9CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgaWYgKCghc2Nyb2xs YWJsZUFyZWFGb3JMYXN0Tm9kZSAmJiAhc2Nyb2xsYWJsZUFyZWFGb3JOb2RlVW5kZXJNb3VzZSkg fHwgc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZSA9PSBzY3JvbGxhYmxlQXJlYUZvck5vZGVVbmRl ck1vdXNlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoc2Nyb2xsYWJsZUFyZWFGb3JMYXN0 Tm9kZSkKKyAgICAgICAgc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZS0+bW91c2VFeGl0ZWRDb250 ZW50QXJlYSgpOworCisgICAgaWYgKHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UpCisg ICAgICAgIHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UtPm1vdXNlRW50ZXJlZENvbnRl bnRBcmVhKCk7Cit9CisKIHN0YXRpYyBSZWZQdHI8RWxlbWVudD4gZmluZEZpcnN0TW91c2VGb2N1 c2FibGVFbGVtZW50SW5Db21wb3NlZFRyZWUoRWxlbWVudCYgaG9zdCkKIHsKICAgICBBU1NFUlQo aG9zdC5zaGFkb3dSb290KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgKaW5kZXggYmRi ZTcwYzgwYmU4NzYzODRiNDFiNjUwNzNjYTkwMjFmOGUxZTQzYi4uY2RkOTdiOTkxZWU4OTM1MDQw NWU0MGQ0ZjIxNmY1MmNmNGMyMDQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCkBA IC00MDMsNiArNDAzLDggQEAgcHJpdmF0ZToKICAgICBlbnVtIGNsYXNzIEZpcmVNb3VzZU92ZXJP dXQgeyBObywgWWVzIH07CiAgICAgdm9pZCB1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0Tm9kZShOb2Rl KiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiwgRmlyZU1vdXNlT3Zlck91dCk7CiAKKyAgICB2 b2lkIG5vdGlmeVNjcm9sbGFibGVBcmVhc09mTW91c2VFbnRlckV4aXQoRWxlbWVudCogbGFzdEVs ZW1lbnRVbmRlck1vdXNlLCBFbGVtZW50KiBlbGVtZW50VW5kZXJNb3VzZSk7CisKICAgICBNb3Vz ZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzIHByZXBhcmVNb3VzZUV2ZW50KGNvbnN0IEhpdFRlc3RS ZXF1ZXN0JiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7CiAKICAgICBlbnVtIGNsYXNzIENh bmNlbGFibGUgeyBObywgWWVzIH07Cg== 398593 2020-05-05 22:40:28 -0700 2020-05-06 08:30:20 -0700 Patch bug-211494-20200505224027.patch text/plain 6177 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJkOWE2MzkyZGQ0NGMz NTg2MzBkZTBmNTZkNGIwMTE2N2ZkNzJiYS4uYThiOGY1MjZmNDg2N2Q2MDZlYjZlYzAyY2YyZTYw MjllYjgyZjZhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA1LTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZhY3RvciBFdmVu dEhhbmRsZXIgY29kZSB0aGF0IHNlbmRzIG1vdXNlRW50ZXJlZENvbnRlbnRBcmVhL21vdXNlRXhp dGVkQ29udGVudEFyZWEgaW50byBpdHMgb3duIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0OTQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtb3VzZUVudGVyZWRDb250ZW50QXJlYS9tb3Vz ZUVudGVyZWRDb250ZW50QXJlYSBhcmUgdXNlZCBvbmx5IHRvIG5vdGlmeSBvdmVybGF5IHNjcm9s bGJhcnMKKyAgICAgICAgb2Ygc3RhdGUgY2hhbmdlcy4gRmFjdG9yIHRoZSBjb2RlIHRoYXQgY2Fs bHMgdGhlc2UgZnVuY3Rpb25zIGludG8gYSBzZXBhcmF0ZSBFdmVudEhhbmRsZXIKKyAgICAgICAg ZnVuY3Rpb24sIGFuZCByZWZhY3RvciBpdCBmb3IgY2xhcml0eSwgbm93IHdlIGtub3cgdGhhdCBi b3RoIGxhc3RFbGVtZW50VW5kZXJNb3VzZSBhbmQgZWxlbWVudFVuZGVyTW91c2UKKyAgICAgICAg bXVzdCBiZWxvbmcgdG8gdGhpcyBFdmVudEhhbmRsZXIncyBGcmFtZSdzIERvY3VtZW50LgorCisg ICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI YW5kbGVyOjp1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6Om5vdGlmeVNjcm9sbGFibGVBcmVhc09mTW91c2VFbnRlckV4aXQpOgorICAg ICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmg6CisKIDIwMjAtMDUtMDUgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRXZlbnRIYW5kbGVyOjpkaXNwYXRj aE1vdXNlRXZlbnQoKSBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5k ZXggNzQyNmQzZTZhODZlZmM3M2JlYjQwMGExZWRkZDdkMzBmZTNlYTA3OS4uMjQxZTY3ZTRlNGVm YjNiMTZjZGE5MjRhMDkwMzVkODA3NDFjNjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5k bGVyLmNwcApAQCAtMjU0OCw0MSArMjU0OCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjp1cGRhdGVN b3VzZUV2ZW50VGFyZ2V0Tm9kZShOb2RlKiB0YXJnZXROb2RlLCBjb25zdCBQbGF0Zm9ybU1vCiAK ICAgICAvLyBGaXJlIG1vdXNlb3V0L21vdXNlb3ZlciBpZiB0aGUgbW91c2UgaGFzIHNoaWZ0ZWQg dG8gYSBkaWZmZXJlbnQgbm9kZS4KICAgICBpZiAoZmlyZU1vdXNlT3Zlck91dCA9PSBGaXJlTW91 c2VPdmVyT3V0OjpZZXMpIHsKLSAgICAgICAgYXV0byBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2Rl ID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEobV9sYXN0RWxlbWVudFVuZGVyTW91c2UuZ2V0KCkp OwotICAgICAgICBhdXRvIHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgPSBlbmNsb3Np bmdTY3JvbGxhYmxlQXJlYShtX2VsZW1lbnRVbmRlck1vdXNlLmdldCgpKTsKLSAgICAgICAgUGFn ZSogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwotCi0gICAgICAgIGlmIChtX2xhc3RFbGVtZW50VW5k ZXJNb3VzZSAmJiAhbV9lbGVtZW50VW5kZXJNb3VzZSkgewotICAgICAgICAgICAgLy8gVGhlIG1v dXNlIGhhcyBtb3ZlZCBiZXR3ZWVuIGZyYW1lcy4KLSAgICAgICAgICAgIGlmIChGcmFtZSogZnJh bWUgPSBtX2xhc3RFbGVtZW50VW5kZXJNb3VzZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkKLSAg ICAgICAgICAgICAgICAgICAgZnJhbWVWaWV3LT5tb3VzZUV4aXRlZENvbnRlbnRBcmVhKCk7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAocGFnZSAmJiAoc2Nyb2xsYWJsZUFyZWFG b3JMYXN0Tm9kZSAmJiAoIXNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgfHwgc2Nyb2xs YWJsZUFyZWFGb3JOb2RlVW5kZXJNb3VzZSAhPSBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlKSkp IHsKLSAgICAgICAgICAgIC8vIFRoZSBtb3VzZSBoYXMgbW92ZWQgYmV0d2VlbiBsYXllcnMuCi0g ICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9sYXN0RWxlbWVudFVuZGVyTW91c2UtPmRv Y3VtZW50KCkuZnJhbWUoKSkgewotICAgICAgICAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1l VmlldyA9IGZyYW1lLT52aWV3KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lVmll dy0+Y29udGFpbnNTY3JvbGxhYmxlQXJlYShzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlKSkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhRm9yTGFzdE5vZGUtPm1vdXNlRXhp dGVkQ29udGVudEFyZWEoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQotICAgICAgICBpZiAobV9lbGVtZW50VW5kZXJNb3VzZSAmJiAhbV9sYXN0RWxlbWVu dFVuZGVyTW91c2UpIHsKLSAgICAgICAgICAgIC8vIFRoZSBtb3VzZSBoYXMgbW92ZWQgYmV0d2Vl biBmcmFtZXMuCi0gICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9lbGVtZW50VW5kZXJN b3VzZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKEZyYW1lVmll dyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkKLSAgICAgICAgICAgICAgICAgICAgZnJhbWVW aWV3LT5tb3VzZUVudGVyZWRDb250ZW50QXJlYSgpOwotICAgICAgICAgICAgfQotICAgICAgICB9 IGVsc2UgaWYgKHBhZ2UgJiYgKHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UgJiYgKCFz Y3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlIHx8IHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91 c2UgIT0gc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZSkpKSB7Ci0gICAgICAgICAgICAvLyBUaGUg bW91c2UgaGFzIG1vdmVkIGJldHdlZW4gbGF5ZXJzLgotICAgICAgICAgICAgaWYgKEZyYW1lKiBm cmFtZSA9IG1fZWxlbWVudFVuZGVyTW91c2UtPmRvY3VtZW50KCkuZnJhbWUoKSkgewotICAgICAg ICAgICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCkpIHsKLSAg ICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lVmlldy0+Y29udGFpbnNTY3JvbGxhYmxlQXJlYShz Y3JvbGxhYmxlQXJlYUZvck5vZGVVbmRlck1vdXNlKSkKLSAgICAgICAgICAgICAgICAgICAgICAg IHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVyTW91c2UtPm1vdXNlRW50ZXJlZENvbnRlbnRBcmVh KCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAg IG5vdGlmeVNjcm9sbGFibGVBcmVhc09mTW91c2VFbnRlckV4aXQobV9sYXN0RWxlbWVudFVuZGVy TW91c2UuZ2V0KCksIG1fZWxlbWVudFVuZGVyTW91c2UuZ2V0KCkpOwogCiAgICAgICAgIGlmICht X2xhc3RFbGVtZW50VW5kZXJNb3VzZSAmJiAmbV9sYXN0RWxlbWVudFVuZGVyTW91c2UtPmRvY3Vt ZW50KCkgIT0gbV9mcmFtZS5kb2N1bWVudCgpKSB7CiAgICAgICAgICAgICBtX2xhc3RFbGVtZW50 VW5kZXJNb3VzZSA9IG51bGxwdHI7CkBAIC0yNjM5LDYgKzI2MDUsMzggQEAgdm9pZCBFdmVudEhh bmRsZXI6OnVwZGF0ZU1vdXNlRXZlbnRUYXJnZXROb2RlKE5vZGUqIHRhcmdldE5vZGUsIGNvbnN0 IFBsYXRmb3JtTW8KICAgICB9CiB9CiAKK3ZvaWQgRXZlbnRIYW5kbGVyOjpub3RpZnlTY3JvbGxh YmxlQXJlYXNPZk1vdXNlRW50ZXJFeGl0KEVsZW1lbnQqIGxhc3RFbGVtZW50VW5kZXJNb3VzZSwg RWxlbWVudCogZWxlbWVudFVuZGVyTW91c2UpCit7CisgICAgYXV0byogZnJhbWVWaWV3ID0gbV9m cmFtZS52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8gc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZSA9IGVuY2xvc2luZ1Njcm9sbGFibGVBcmVh KGxhc3RFbGVtZW50VW5kZXJNb3VzZSk7CisgICAgYXV0byBzY3JvbGxhYmxlQXJlYUZvck5vZGVV bmRlck1vdXNlID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEoZWxlbWVudFVuZGVyTW91c2UpOwor CisgICAgaWYgKCEhbGFzdEVsZW1lbnRVbmRlck1vdXNlICE9ICEhZWxlbWVudFVuZGVyTW91c2Up IHsKKyAgICAgICAgaWYgKGVsZW1lbnRVbmRlck1vdXNlKSB7CisgICAgICAgICAgICBmcmFtZVZp ZXctPm1vdXNlRW50ZXJlZENvbnRlbnRBcmVhKCk7CisgICAgICAgICAgICBpZiAoc2Nyb2xsYWJs ZUFyZWFGb3JOb2RlVW5kZXJNb3VzZSkKKyAgICAgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYUZv ck5vZGVVbmRlck1vdXNlLT5tb3VzZUVudGVyZWRDb250ZW50QXJlYSgpOworICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgaWYgKHNjcm9sbGFibGVBcmVhRm9yTGFzdE5vZGUpCisgICAgICAg ICAgICAgICAgc2Nyb2xsYWJsZUFyZWFGb3JMYXN0Tm9kZS0+bW91c2VFeGl0ZWRDb250ZW50QXJl YSgpOworICAgICAgICAgICAgZnJhbWVWaWV3LT5tb3VzZUV4aXRlZENvbnRlbnRBcmVhKCk7Cisg ICAgICAgIH0KKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICAKKyAgICBpZiAoKCFzY3JvbGxh YmxlQXJlYUZvckxhc3ROb2RlICYmICFzY3JvbGxhYmxlQXJlYUZvck5vZGVVbmRlck1vdXNlKSB8 fCBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlID09IHNjcm9sbGFibGVBcmVhRm9yTm9kZVVuZGVy TW91c2UpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChzY3JvbGxhYmxlQXJlYUZvckxhc3RO b2RlKQorICAgICAgICBzY3JvbGxhYmxlQXJlYUZvckxhc3ROb2RlLT5tb3VzZUV4aXRlZENvbnRl bnRBcmVhKCk7CisKKyAgICBpZiAoc2Nyb2xsYWJsZUFyZWFGb3JOb2RlVW5kZXJNb3VzZSkKKyAg ICAgICAgc2Nyb2xsYWJsZUFyZWFGb3JOb2RlVW5kZXJNb3VzZS0+bW91c2VFbnRlcmVkQ29udGVu dEFyZWEoKTsKK30KKwogc3RhdGljIFJlZlB0cjxFbGVtZW50PiBmaW5kRmlyc3RNb3VzZUZvY3Vz YWJsZUVsZW1lbnRJbkNvbXBvc2VkVHJlZShFbGVtZW50JiBob3N0KQogewogICAgIEFTU0VSVCho b3N0LnNoYWRvd1Jvb3QoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAppbmRleCBiZGJl NzBjODBiZTg3NjM4NGI0MWI2NTA3M2NhOTAyMWY4ZTFlNDNiLi5jZGQ5N2I5OTFlZTg5MzUwNDA1 ZTQwZDRmMjE2ZjUyY2Y0YzIwNDQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgKQEAg LTQwMyw2ICs0MDMsOCBAQCBwcml2YXRlOgogICAgIGVudW0gY2xhc3MgRmlyZU1vdXNlT3Zlck91 dCB7IE5vLCBZZXMgfTsKICAgICB2b2lkIHVwZGF0ZU1vdXNlRXZlbnRUYXJnZXROb2RlKE5vZGUq LCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBGaXJlTW91c2VPdmVyT3V0KTsKIAorICAgIHZv aWQgbm90aWZ5U2Nyb2xsYWJsZUFyZWFzT2ZNb3VzZUVudGVyRXhpdChFbGVtZW50KiBsYXN0RWxl bWVudFVuZGVyTW91c2UsIEVsZW1lbnQqIGVsZW1lbnRVbmRlck1vdXNlKTsKKwogICAgIE1vdXNl RXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMgcHJlcGFyZU1vdXNlRXZlbnQoY29uc3QgSGl0VGVzdFJl cXVlc3QmLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKIAogICAgIGVudW0gY2xhc3MgQ2Fu Y2VsYWJsZSB7IE5vLCBZZXMgfTsK