103382 2012-11-27 02:24:00 -0800 PDFPlugin: Scroll bars do not grow on hover 2012-11-27 13:57:53 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ap bdakin mitz sam oldest_to_newest 776522 0 thorton 2012-11-27 02:24:00 -0800 <rdar://problem/12555262> 776523 1 thorton 2012-11-27 02:24:15 -0800 This also covers non-overlay scrollbars not glowing, etc. 776538 2 176213 thorton 2012-11-27 02:39:28 -0800 Created attachment 176213 patch 777146 3 176213 bdakin 2012-11-27 13:00:34 -0800 Comment on attachment 176213 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176213&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:436 > + if (magnification) { I don't think you need these brackets. > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:566 > + } else if (targetScrollbarForLastMousePosition) Is 'else if' right here? Will there ever be a situation where you want to sent a mouseEntered for one scrollbar AND a mouseExited for another? 777183 4 thorton 2012-11-27 13:48:50 -0800 (In reply to comment #3) > (From update of attachment 176213 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=176213&action=review > > > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:436 > > + if (magnification) { > > I don't think you need these brackets. Nope! They're a figment of debugging, sorry. > > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:566 > > + } else if (targetScrollbarForLastMousePosition) > > Is 'else if' right here? Will there ever be a situation where you want to sent a mouseEntered for one scrollbar AND a mouseExited for another? Though it will rarely come up in practice, you're right. Thanks, Beth! 777198 5 thorton 2012-11-27 13:57:53 -0800 http://trac.webkit.org/changeset/135916 176213 2012-11-27 02:39:28 -0800 2012-11-27 13:00:33 -0800 patch scrollbars.diff text/plain 11392 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1Yzk5NjdkLi45NTVhMGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMTEtMjcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiBTY3JvbGwgYmFycyBkbyBub3QgZ3JvdyBvbiBob3ZlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMzgyCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8xMjU1NTI2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvcnQgYSBmZXcgV2ViQ29yZTo6U2Nyb2xsYmFyIG1l dGhvZHMgdG8gV2ViS2l0KDIpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisKIDIwMTIt MTEtMjYgIE1pY2hhZWwgUHJ1ZXR0ICA8bWljaGFlbEA2OGsub3JnPgogCiAgICAgICAgIFtHVEtd IEZpeCBidWlsZCBlcnJvciBvbiBHVEsgZHVlIHRvIHIxMzU3NDkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4K aW5kZXggMjg1NjA1Ni4uODJlMzBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTEwNzYsNiAr MTA3Niw5IEBAIF9fWk43V2ViQ29yZTlQYWdlR3JvdXAyNnNldFNob3VsZFRyYWNrVmlzaXRlZExp bmtzRWIKIF9fWk43V2ViQ29yZTlQYWdlR3JvdXAyOXJlbW92ZVVzZXJTdHlsZVNoZWV0RnJvbVdv cmxkRVBOU18xNURPTVdyYXBwZXJXb3JsZEVSS05TXzRLVVJMRQogX19aTjdXZWJDb3JlOVBhZ2VH cm91cDMwcmVtb3ZlVXNlclN0eWxlU2hlZXRzRnJvbVdvcmxkRVBOU18xNURPTVdyYXBwZXJXb3Js ZEUKIF9fWk43V2ViQ29yZTlQYWdlR3JvdXA5cGFnZUdyb3VwRVJLTjNXVEY2U3RyaW5nRQorX19a TjdXZWJDb3JlOVNjcm9sbGJhcjEwbW91c2VNb3ZlZEVSS05TXzE4UGxhdGZvcm1Nb3VzZUV2ZW50 RQorX19aTjdXZWJDb3JlOVNjcm9sbGJhcjExbW91c2VFeGl0ZWRFdgorX19aTjdXZWJDb3JlOVNj cm9sbGJhcjEybW91c2VFbnRlcmVkRXYKIF9fWk43V2ViQ29yZTlTY3JvbGxiYXIxM3NldFByb3Bv cnRpb25FaWkKIF9fWk43V2ViQ29yZTlTY3JvbGxiYXIyMWNyZWF0ZU5hdGl2ZVNjcm9sbGJhckVQ TlNfMTRTY3JvbGxhYmxlQXJlYUVOU18yMFNjcm9sbGJhck9yaWVudGF0aW9uRU5TXzIwU2Nyb2xs YmFyQ29udHJvbFNpemVFCiBfX1pON1dlYkNvcmU5U2Nyb2xsYmFyMjJtYXhPdmVybGFwQmV0d2Vl blBhZ2VzRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlMGFiOTA1Li5lZDhkMWZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzQgQEAKKzIwMTItMTEtMjcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBs ZS5jb20+CisKKyAgICAgICAgUERGUGx1Z2luOiBTY3JvbGwgYmFycyBkbyBub3QgZ3JvdyBvbiBo b3ZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAz MzgyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjU1NTI2Mj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQREZQbHVnaW4gbmVlZHMgdG8gZm9yd2Fy ZCByZWxldmFudCBtb3VzZSBldmVudHMgdG8gdGhlIHNjcm9sbGJhcnMuCisgICAgICAgIEluIGFk ZGl0aW9uLCBpdCBuZWVkcyB0byBpbXBsZW1lbnQgY3VycmVudE1vdXNlUG9zaXRpb24gc28gU2Ny b2xsYWJsZUFyZWEgYW5kIGZyaWVuZHMKKyAgICAgICAgY2FuIGZpbmQgdGhlIG1vdXNlIHBvc2l0 aW9uIGF0IGFyYml0cmFyeSB0aW1lcy4KKworICAgICAgICBJIGFsc28gdG9vayB0aGlzIG9wcG9y dHVuaXR5IHRvIGZhY3RvciBzb21lIGNvb3JkaW5hdGUgc3BhY2UgY29udmVyc2lvbiBmdW5jdGlv bnMgb3V0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaDoK KyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpjdXJyZW50TW91c2VQb3NpdGlvbik6IEFkZGVk LiBSZXR1cm4gdGhlIGxhc3QgbW91c2UgcG9zaXRpb24gaW4gb3VyIGNvb3JkaW5hdGUgc3BhY2Uu CisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6Y29udmVydEZyb21Sb290Vmlld1RvUGx1Z2lu KTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6Y29udmVydEZyb21QbHVnaW5U b1BERlZpZXcpOiBBZGRlZC4KKyAgICAgICAgKFBERlBsdWdpbik6CisgICAgICAgICogV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW06CisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdp bjo6Y29udmVydEZyb21Sb290Vmlld1RvUGx1Z2luKTogQ29udmVydCBhIHBvaW50IGZyb20gY29u dGVudCBzcGFjZSB0byBwbHVnaW4gc3BhY2UsIHZpYSB0aGUgdHJhbnNmb3JtIHdlIGdldCBpbiBn ZW9tZXRyeURpZENoYW5nZS4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpjb252ZXJ0RnJv bVBsdWdpblRvUERGVmlldyk6IENvbnZlcnQgYSBwb2ludCBmcm9tIHBsdWdpbiBzcGFjZSB0byBQ REZMYXllckNvbnRyb2xsZXIncyBmbGlwcGVkIGNvb3JkaW5hdGUgc3BhY2UuCisgICAgICAgIChX ZWJLaXQ6OlBERlBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UpOiBVc2UgY29udmVydEZyb21QbHVn aW5Ub1BERlZpZXcuCisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6bnNFdmVudEZvcldlYk1v dXNlRXZlbnQpOiBDYWNoZSB0aGUgbW91c2UgcG9zaXRpb24gaW4gcGx1Z2luIHNwYWNlIGluc3Rl YWQgb2YgUERGTGF5ZXJDb250cm9sbGVyIHNwYWNlLiBVc2Ugb3VyIG5ldyBjb252ZXJzaW9uIGZ1 bmN0aW9ucy4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpoYW5kbGVNb3VzZUV2ZW50KTog Rm9yd2FyZCByZWxldmFudCBtb3VzZSBldmVudHMgdG8gc2Nyb2xsYmFyczoKKyAgICAgICAgRGV0 ZXJtaW5lIHdoaWNoIHNjcm9sbGJhciB0aGUgbW91c2UgaXMgb3ZlciBub3csIGFuZCB3aGljaCBp dCB3YXMgcHJldmlvdXNseSBvdmVyLCBhbmQgdXNlIHRoYXQgdG86CisgICAgICAgIElmIHRoZSBt b3VzZSBpcyBtb3ZlZCBvdmVyIGEgc2Nyb2xsYmFyLCBzZW5kIG1vdXNlRW50ZXJlZCB0byB0aGUg c2Nyb2xsYmFyLgorICAgICAgICBJZiB0aGUgbW91c2UgaXMgbW92ZWQgb3V0IG9mIGEgc2Nyb2xs YmFyLCBzZW5kIG1vdXNlRXhpdGVkIHRvIHRoZSBzY3JvbGxiYXIuCisgICAgICAgIElmIHRoZSBt b3VzZSBpcyBjdXJyZW50bHkgb3ZlciBhIHNjcm9sbGJhciwgc2VuZCBtb3VzZU1vdmVkL1VwL0Rv d24gdG8gdGhlIHNjcm9sbGJhciBpbnN0ZWFkIG9mIFBERkxheWVyQ29udHJvbGxlci4KKyAgICAg ICAgSWYgdGhlIG1vdXNlIGlzIGN1cnJlbnRseSBvdmVyIHRoZSBzY3JvbGwgY29ybmVyLCBiYWls LCBiZWNhdXNlIG5vYm9keSBzaG91bGQgZ2V0IHRob3NlIGV2ZW50cy4KKwogMjAxMi0xMS0yNiAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzNTgxOC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCmluZGV4IGExMjMzZmEuLjEyOWU5OTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2lu LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4u aApAQCAtOTQsOCArOTQsMTEgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xs T2Zmc2V0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFdlYkNvcmU6OlNjcm9sbGJhciosIGNvbnN0IFdl YkNvcmU6OkludFJlY3QmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVNj cm9sbENvcm5lclJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIE9WRVJSSURFOworICAgIHZp cnR1YWwgV2ViQ29yZTo6SW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBtX2xhc3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlczsgfQogICAgIAogICAg IE5TRXZlbnQgKm5zRXZlbnRGb3JXZWJNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsK KyAgICBXZWJDb3JlOjpJbnRQb2ludCBjb252ZXJ0RnJvbVBsdWdpblRvUERGVmlldyhjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYpIGNvbnN0OworICAgIFdlYkNvcmU6OkludFBvaW50IGNvbnZlcnRG cm9tUm9vdFZpZXdUb1BsdWdpbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIGNvbnN0OwogICAg IAogICAgIGJvb2wgc3VwcG9ydHNGb3JtcygpOwogCkBAIC0xMTAsOCArMTEzLDggQEAgcHJpdmF0 ZToKICAgICBSZWZQdHI8V2ViQ29yZTo6RWxlbWVudD4gbV9hbm5vdGF0aW9uQ29udGFpbmVyOwog CiAgICAgV2ViQ29yZTo6QWZmaW5lVHJhbnNmb3JtIG1fcm9vdFZpZXdUb1BsdWdpblRyYW5zZm9y bTsKLSAgICBXZWJDb3JlOjpJbnRQb2ludCBtX2xhc3RNb3VzZVBvaW50OwogICAgIFdlYk1vdXNl RXZlbnQgbV9sYXN0TW91c2VFdmVudDsKKyAgICBXZWJDb3JlOjpJbnRQb2ludCBtX2xhc3RNb3Vz ZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlczsKICAgICAKICAgICBSZXRhaW5QdHI8V0tQREZM YXllckNvbnRyb2xsZXJEZWxlZ2F0ZT4gbV9wZGZMYXllckNvbnRyb2xsZXJEZWxlZ2F0ZTsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2lu Lm1tCmluZGV4IGM3MzdmYjQuLmU4OWI0NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCkBAIC00MDUsNiArNDA1LDE2IEBAIFBs YXRmb3JtTGF5ZXIqIFBERlBsdWdpbjo6cGx1Z2luTGF5ZXIoKQogICAgIHJldHVybiBtX2NvbnRh aW5lckxheWVyLmdldCgpOwogfQogCitJbnRQb2ludCBQREZQbHVnaW46OmNvbnZlcnRGcm9tUm9v dFZpZXdUb1BsdWdpbihjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0Cit7CisgICAgcmV0dXJu IG1fcm9vdFZpZXdUb1BsdWdpblRyYW5zZm9ybS5tYXBQb2ludChwb2ludCk7Cit9CisKK0ludFBv aW50IFBERlBsdWdpbjo6Y29udmVydEZyb21QbHVnaW5Ub1BERlZpZXcoY29uc3QgSW50UG9pbnQm IHBvaW50KSBjb25zdAoreworICAgIHJldHVybiBJbnRQb2ludChwb2ludC54KCksIHNpemUoKS5o ZWlnaHQoKSAtIHBvaW50LnkoKSk7Cit9CisKIHZvaWQgUERGUGx1Z2luOjpnZW9tZXRyeURpZENo YW5nZShjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBjb25zdCBJbnRSZWN0JiwgY29uc3QgQWZm aW5lVHJhbnNmb3JtJiBwbHVnaW5Ub1Jvb3RWaWV3VHJhbnNmb3JtKQogewogICAgIGlmIChzaXpl KCkgPT0gcGx1Z2luU2l6ZSAmJiBwbHVnaW5WaWV3KCktPnBhZ2VTY2FsZUZhY3RvcigpID09IFtt X3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBjb250ZW50U2NhbGVGYWN0b3JdKQpAQCAtNDIyLDkg KzQzMiwxMCBAQCB2b2lkIFBERlBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgSW50U2l6 ZSYgcGx1Z2luU2l6ZSwgY29uc3QgSW50UmVjdCYsIGNvbgogICAgIGlmIChoYW5kbGVzUGFnZVNj YWxlRmFjdG9yKCkpIHsKICAgICAgICAgQ0dGbG9hdCBtYWduaWZpY2F0aW9uID0gcGx1Z2luVmll dygpLT5wYWdlU2NhbGVGYWN0b3IoKSAtIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBjb250 ZW50U2NhbGVGYWN0b3JdOwogCi0gICAgICAgIC8vIEZJWE1FOiBJbnN0ZWFkIG9mIG1fbGFzdE1v dXNlUG9pbnQsIHdlIHNob3VsZCB1c2UgdGhlIHpvb20gb3JpZ2luIGZyb20gUGx1Z2luVmlldzo6 c2V0UGFnZVNjYWxlRmFjdG9yLgotICAgICAgICBpZiAobWFnbmlmaWNhdGlvbikKLSAgICAgICAg ICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBtYWduaWZ5V2l0aE1hZ25pZmljYXRpb246 bWFnbmlmaWNhdGlvbiBhdFBvaW50Om1fbGFzdE1vdXNlUG9pbnQgaW1tZWRpYXRlbHk6Tk9dOwor ICAgICAgICAvLyBGSVhNRTogSW5zdGVhZCBvZiBtX2xhc3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5D b29yZGluYXRlcywgd2Ugc2hvdWxkIHVzZSB0aGUgem9vbSBvcmlnaW4gZnJvbSBQbHVnaW5WaWV3 OjpzZXRQYWdlU2NhbGVGYWN0b3IuCisgICAgICAgIGlmIChtYWduaWZpY2F0aW9uKSB7CisgICAg ICAgICAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0KCkgbWFnbmlmeVdpdGhNYWduaWZpY2F0 aW9uOm1hZ25pZmljYXRpb24gYXRQb2ludDpjb252ZXJ0RnJvbVBsdWdpblRvUERGVmlldyhtX2xh c3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlcykgaW1tZWRpYXRlbHk6Tk9dOworICAg ICAgICB9CiAgICAgfQogCiAgICAgY2FsY3VsYXRlU2l6ZXMoKTsKQEAgLTQ5MywxMyArNTA0LDkg QEAgc3RhdGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZyb21XZWJFdmVudChjb25zdCBXZWJFdmVu dCYgZXZlbnQpCiAgICAgCiBOU0V2ZW50ICpQREZQbHVnaW46Om5zRXZlbnRGb3JXZWJNb3VzZUV2 ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQogewotICAgIEludFBvaW50IG1vdXNlUG9z aXRpb24gPSBldmVudC5wb3NpdGlvbigpOwotCi0gICAgSW50UG9pbnQgcG9zaXRpb25JblBERlZp ZXcobW91c2VQb3NpdGlvbik7Ci0gICAgcG9zaXRpb25JblBERlZpZXcgPSBtX3Jvb3RWaWV3VG9Q bHVnaW5UcmFuc2Zvcm0ubWFwUG9pbnQocG9zaXRpb25JblBERlZpZXcpOwotICAgIHBvc2l0aW9u SW5QREZWaWV3LnNldFkoc2l6ZSgpLmhlaWdodCgpIC0gcG9zaXRpb25JblBERlZpZXcueSgpKTsK KyAgICBtX2xhc3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlcyA9IGNvbnZlcnRGcm9t Um9vdFZpZXdUb1BsdWdpbihldmVudC5wb3NpdGlvbigpKTsKIAotICAgIG1fbGFzdE1vdXNlUG9p bnQgPSBwb3NpdGlvbkluUERGVmlldzsKKyAgICBJbnRQb2ludCBwb3NpdGlvbkluUERGVmlld0Nv b3JkaW5hdGVzKGNvbnZlcnRGcm9tUGx1Z2luVG9QREZWaWV3KG1fbGFzdE1vdXNlUG9zaXRpb25J blBsdWdpbkNvb3JkaW5hdGVzKSk7CiAKICAgICBOU0V2ZW50VHlwZSBldmVudFR5cGUgPSBldmVu dFR5cGVGcm9tV2ViRXZlbnQoZXZlbnQpOwogCkBAIC01MDgsMTkgKzUxNSwzNiBAQCBOU0V2ZW50 ICpQREZQbHVnaW46Om5zRXZlbnRGb3JXZWJNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQm IGV2ZW50KQogCiAgICAgTlNVSW50ZWdlciBtb2RpZmllckZsYWdzID0gbW9kaWZpZXJGbGFnc0Zy b21XZWJFdmVudChldmVudCk7CiAKLSAgICByZXR1cm4gW05TRXZlbnQgbW91c2VFdmVudFdpdGhU eXBlOmV2ZW50VHlwZSBsb2NhdGlvbjpwb3NpdGlvbkluUERGVmlldyBtb2RpZmllckZsYWdzOm1v ZGlmaWVyRmxhZ3MgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOjAgY29udGV4dDpuaWwgZXZlbnRO dW1iZXI6MCBjbGlja0NvdW50OmV2ZW50LmNsaWNrQ291bnQoKSBwcmVzc3VyZTowXTsKKyAgICBy ZXR1cm4gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOmV2ZW50VHlwZSBsb2NhdGlvbjpwb3Np dGlvbkluUERGVmlld0Nvb3JkaW5hdGVzIG1vZGlmaWVyRmxhZ3M6bW9kaWZpZXJGbGFncyB0aW1l c3RhbXA6MCB3aW5kb3dOdW1iZXI6MCBjb250ZXh0Om5pbCBldmVudE51bWJlcjowIGNsaWNrQ291 bnQ6ZXZlbnQuY2xpY2tDb3VudCgpIHByZXNzdXJlOjBdOwogfQogCiBib29sIFBERlBsdWdpbjo6 aGFuZGxlTW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKIHsKKyAgICBQbGF0 Zm9ybU1vdXNlRXZlbnQgcGxhdGZvcm1FdmVudCA9IHBsYXRmb3JtKGV2ZW50KTsKKyAgICBJbnRQ b2ludCBtb3VzZVBvc2l0aW9uID0gY29udmVydEZyb21Sb290Vmlld1RvUGx1Z2luKGV2ZW50LnBv c2l0aW9uKCkpOworCiAgICAgbV9sYXN0TW91c2VFdmVudCA9IGV2ZW50OwogCi0gICAgSW50UG9p bnQgbW91c2VQb3NpdGlvbiA9IGV2ZW50LnBvc2l0aW9uKCk7CisgICAgUmVmUHRyPFNjcm9sbGJh cj4gdGFyZ2V0U2Nyb2xsYmFyOworICAgIFJlZlB0cjxTY3JvbGxiYXI+IHRhcmdldFNjcm9sbGJh ckZvckxhc3RNb3VzZVBvc2l0aW9uOworCisgICAgaWYgKG1fdmVydGljYWxTY3JvbGxiYXJMYXll cikgeworICAgICAgICBJbnRSZWN0IHZlcnRpY2FsU2Nyb2xsYmFyRnJhbWUobV92ZXJ0aWNhbFNj cm9sbGJhckxheWVyLmdldCgpLmZyYW1lKTsKKyAgICAgICAgaWYgKHZlcnRpY2FsU2Nyb2xsYmFy RnJhbWUuY29udGFpbnMobW91c2VQb3NpdGlvbikpCisgICAgICAgICAgICB0YXJnZXRTY3JvbGxi YXIgPSB2ZXJ0aWNhbFNjcm9sbGJhcigpOworICAgICAgICBpZiAodmVydGljYWxTY3JvbGxiYXJG cmFtZS5jb250YWlucyhtX2xhc3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGluYXRlcykpCisg ICAgICAgICAgICB0YXJnZXRTY3JvbGxiYXJGb3JMYXN0TW91c2VQb3NpdGlvbiA9IHZlcnRpY2Fs U2Nyb2xsYmFyKCk7CisgICAgfQorCisgICAgaWYgKG1faG9yaXpvbnRhbFNjcm9sbGJhckxheWVy KSB7CisgICAgICAgIEludFJlY3QgaG9yaXpvbnRhbFNjcm9sbGJhckZyYW1lKG1faG9yaXpvbnRh bFNjcm9sbGJhckxheWVyLmdldCgpLmZyYW1lKTsKKyAgICAgICAgaWYgKGhvcml6b250YWxTY3Jv bGxiYXJGcmFtZS5jb250YWlucyhtb3VzZVBvc2l0aW9uKSkKKyAgICAgICAgICAgIHRhcmdldFNj cm9sbGJhciA9IGhvcml6b250YWxTY3JvbGxiYXIoKTsKKyAgICAgICAgaWYgKGhvcml6b250YWxT Y3JvbGxiYXJGcmFtZS5jb250YWlucyhtX2xhc3RNb3VzZVBvc2l0aW9uSW5QbHVnaW5Db29yZGlu YXRlcykpCisgICAgICAgICAgICB0YXJnZXRTY3JvbGxiYXJGb3JMYXN0TW91c2VQb3NpdGlvbiA9 IGhvcml6b250YWxTY3JvbGxiYXIoKTsKKyAgICB9CiAKLSAgICAvLyBGSVhNRTogRm9yd2FyZCBt b3VzZSBldmVudHMgdG8gdGhlIGFwcHJvcHJpYXRlIHNjcm9sbGJhci4KLSAgICBpZiAoSW50UmVj dChtX3ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIuZ2V0KCkuZnJhbWUpLmNvbnRhaW5zKG1vdXNlUG9z aXRpb24pCi0gICAgICAgIHx8IEludFJlY3QobV9ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIuZ2V0 KCkuZnJhbWUpLmNvbnRhaW5zKG1vdXNlUG9zaXRpb24pCi0gICAgICAgIHx8IEludFJlY3QobV9z Y3JvbGxDb3JuZXJMYXllci5nZXQoKS5mcmFtZSkuY29udGFpbnMobW91c2VQb3NpdGlvbikpCisg ICAgaWYgKG1fc2Nyb2xsQ29ybmVyTGF5ZXIgJiYgSW50UmVjdChtX3Njcm9sbENvcm5lckxheWVy LmdldCgpLmZyYW1lKS5jb250YWlucyhtb3VzZVBvc2l0aW9uKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgLy8gUmlnaHQtY2xpY2tzIGFuZCBDb250cm9sLWNsaWNrcyBhbHdheXMgY2Fs bCBoYW5kbGVDb250ZXh0TWVudUV2ZW50IGFzIHdlbGwuCkBAIC01MzMsNiArNTU3LDE1IEBAIGJv b2wgUERGUGx1Z2luOjpoYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50 KQogICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNlTW92ZToKICAgICAgICAgbW91c2VNb3ZlZEluQ29u dGVudEFyZWEoKTsKIAorICAgICAgICBpZiAodGFyZ2V0U2Nyb2xsYmFyKSB7CisgICAgICAgICAg ICBpZiAoIXRhcmdldFNjcm9sbGJhckZvckxhc3RNb3VzZVBvc2l0aW9uKSB7CisgICAgICAgICAg ICAgICAgdGFyZ2V0U2Nyb2xsYmFyLT5tb3VzZUVudGVyZWQoKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiB0YXJnZXRTY3Jv bGxiYXItPm1vdXNlTW92ZWQocGxhdGZvcm1FdmVudCk7CisgICAgICAgIH0gZWxzZSBpZiAodGFy Z2V0U2Nyb2xsYmFyRm9yTGFzdE1vdXNlUG9zaXRpb24pCisgICAgICAgICAgICB0YXJnZXRTY3Jv bGxiYXJGb3JMYXN0TW91c2VQb3NpdGlvbi0+bW91c2VFeGl0ZWQoKTsKKwogICAgICAgICBzd2l0 Y2ggKGV2ZW50LmJ1dHRvbigpKSB7CiAgICAgICAgIGNhc2UgV2ViTW91c2VFdmVudDo6TGVmdEJ1 dHRvbjoKICAgICAgICAgICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBtb3VzZURyYWdn ZWQ6bnNFdmVudF07CkBAIC01NDcsNiArNTgwLDkgQEAgYm9vbCBQREZQbHVnaW46OmhhbmRsZU1v dXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiAgICAgY2FzZSBXZWJFdmVudDo6 TW91c2VEb3duOgogICAgICAgICBzd2l0Y2ggKGV2ZW50LmJ1dHRvbigpKSB7CiAgICAgICAgIGNh c2UgV2ViTW91c2VFdmVudDo6TGVmdEJ1dHRvbjoKKyAgICAgICAgICAgIGlmICh0YXJnZXRTY3Jv bGxiYXIpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRhcmdldFNjcm9sbGJhci0+bW91c2VEb3du KHBsYXRmb3JtRXZlbnQpOworCiAgICAgICAgICAgICBbbV9wZGZMYXllckNvbnRyb2xsZXIuZ2V0 KCkgbW91c2VEb3duOm5zRXZlbnRdOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg IGNhc2UgV2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b246CkBAIC01NTksNiArNTk1LDkgQEAgYm9v bCBQREZQbHVnaW46OmhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQp CiAgICAgY2FzZSBXZWJFdmVudDo6TW91c2VVcDoKICAgICAgICAgc3dpdGNoIChldmVudC5idXR0 b24oKSkgewogICAgICAgICBjYXNlIFdlYk1vdXNlRXZlbnQ6OkxlZnRCdXR0b246CisgICAgICAg ICAgICBpZiAodGFyZ2V0U2Nyb2xsYmFyKQorICAgICAgICAgICAgICAgIHJldHVybiB0YXJnZXRT Y3JvbGxiYXItPm1vdXNlVXAocGxhdGZvcm1FdmVudCk7CisKICAgICAgICAgICAgIFttX3BkZkxh eWVyQ29udHJvbGxlci5nZXQoKSBtb3VzZVVwOm5zRXZlbnRdOwogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgICAgIGNhc2UgV2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b246Cg==