133262 2014-05-24 22:30:35 -0700 [iOS][WK2] Use ScrollView's scrollOffset as the unobscuredContentRect 2014-06-23 16:15:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin dbates oldest_to_newest 1011557 0 benjamin 2014-05-24 22:30:35 -0700 [iOS][WK2] Use ScrollView's scrollOffset as the unobscuredContentRect 1011558 1 232029 benjamin 2014-05-24 22:43:02 -0700 Created attachment 232029 Patch 1011559 2 benjamin 2014-05-24 22:43:39 -0700 <rdar://problem/17028081> 1011594 3 232029 benjamin 2014-05-25 15:18:09 -0700 Comment on attachment 232029 Patch Clearing flags on attachment: 232029 Committed r169324: <http://trac.webkit.org/changeset/169324> 1011595 4 benjamin 2014-05-25 15:18:11 -0700 All reviewed patches have been landed. Closing bug. 1017747 5 dbates 2014-06-23 16:15:46 -0700 (In reply to comment #3) > (From update of attachment 232029 [details]) > Clearing flags on attachment: 232029 > > Committed r169324: <http://trac.webkit.org/changeset/169324> This regressed assisted node focusing. See bug #134219 for more details. 232029 2014-05-24 22:43:02 -0700 2014-05-25 15:18:08 -0700 Patch bug-133262-20140524224227.patch text/plain 8050 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg3Yzk4N2E2MzVlNzNh ZDhlYWJiOTRmZjA2NTI2ODFhZDU4YzU3Yi4uYzNmZWFhNmVjNjNjYjQ0N2M2NDA3M2RhNmNhM2Iz YTk2ZTJmMzM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTI0ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g VXNlIFNjcm9sbFZpZXcncyBzY3JvbGxPZmZzZXQgYXMgdGhlIHVub2JzY3VyZWRDb250ZW50UmVj dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMjYy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ug VmlzaWJsZUNvbnRlbnRSZWN0IHdhcyBmaXhlZCwgd2Ugd2VyZSBubyBsb25nZXIgc2VuZGluZyBz Y3JvbGwgZXZlbnRzIHdoZW4gdXBkYXRpbmcgdGhlIHNjcm9sbE9mZnNldAorICAgICAgICB3aGVu IHVwZGF0aW5nIHRoZSB2aXNpYmxlIGNvbnRlbnQgcmVjdHMuIFRoZSByZWFzb24gaXMgdGhhdCB0 aGUgc2Nyb2xsT2Zmc2V0IHdhcyBkZWZpbmVkIGFzIHRoZSB0b3AgbGVmdCBvZiB0aGUKKyAgICAg ICAgVmlzaWJsZUNvbnRlbnRSZWN0LCBhbmQgYXMgc3VjaCB3YXMgYWxyZWFkeSBhdCB0aGUgZW5k IHBvc2l0aW9uIGFmdGVyIHVwZGF0aW5nIHRoZSB1bm9ic2N1cmVkIHJlY3QuCisKKyAgICAgICAg VGhpcyBwYXRjaCBzcGxpdCB0aGUgdW5vYnNjdXJlZENvbnRlbnRSZWN0IGluIHVub2JzY3VyZWRD b250ZW50U2l6ZSAodXBkYXRlZCBsaXZlIG9uIHpvb20pIGFuZCB0aGUgcG9zaXRpb24gZGVmaW5l ZAorICAgICAgICBieSB0aGUgU2Nyb2xsVmlldydzIHNjcm9sbE9mZnNldCAodXBkYXRlZCB3aGVu IHNjcm9sbGluZykuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1Mu bW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp1bm9ic2N1cmVkQ29udGVudFJlY3Qp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0VW5vYnNjdXJlZENvbnRlbnRTaXpl KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldFVub2JzY3VyZWRDb250ZW50UmVj dCk6IERlbGV0ZWQuCisKIDIwMTQtMDUtMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlJ3Mg bV9zY3JvbGxQb3NpdGlvbiB0byBtYWtlIGl0IGNsZWFyIHRoYXQgaXQncyB0aGUgdmFsdWUgY29t bWl0dGVkIGZyb20gdGhlIHN0YXRlIHRyZWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwNzgxZTI5NzMyODdjMmEy YjRlMzVlOWJhMGRiNmFiMjBiZmMxZmVlLi42MDllY2E3YzM0OTkxYzQ1NDA1YjBlZTczZTYzZWM4 NDhkMDk3ZjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDUtMjQgIEJlbmph bWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU11bV0syXSBV c2UgU2Nyb2xsVmlldydzIHNjcm9sbE9mZnNldCBhcyB0aGUgdW5vYnNjdXJlZENvbnRlbnRSZWN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMyNjIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OnZpZXdwb3J0Q29uZmlndXJhdGlvbkNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Ojp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKToKKwogMjAxNC0wNS0yMyAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGUncyBtX3Njcm9sbFBvc2l0aW9uIHRvIG1ha2UgaXQgY2xlYXIgdGhhdCBp dCdzIHRoZSB2YWx1ZSBjb21taXR0ZWQgZnJvbSB0aGUgc3RhdGUgdHJlZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgppbmRleCBkYjRiZDg0OTA0MmM4NjI2NWJhYjc2MTVhOTZhYzkzNTgwZWVjMjJiLi5kNzg1 NzVmYWM3MGU4ZmY3ZTg1NDY5M2Y2MmNiZjNkZjY1ZjhlZWE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgpAQCAtMjQ3Nyw3ICsyNDc3LDcgQEAgX1dlYlVJQXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZl Tm90aWZpY2F0aW9uCiBfX1pON1dlYkNvcmUxMFJlbmRlclZpZXczNXJlc3VtZVBhdXNlZEltYWdl QW5pbWF0aW9uc0lmTmVlZGVkRXYKIF9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzE1c2V0U2Nyb2xs T2Zmc2V0RVJLTlNfOEludFBvaW50RQogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjFzZXRFeHBv c2VkQ29udGVudFJlY3RFUktOU183SW50UmVjdEUKLV9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzI0 c2V0VW5vYnNjdXJlZENvbnRlbnRSZWN0RVJLTlNfN0ludFJlY3RFCitfX1pON1dlYkNvcmUxMFNj cm9sbFZpZXcyNHNldFVub2JzY3VyZWRDb250ZW50U2l6ZUVSS05TXzdJbnRTaXplRQogX19aTjdX ZWJDb3JlMTBYTGlua05hbWVzNGluaXRFdgogX19aTjdXZWJDb3JlMTBpblNhbWVMaW5lRVJLTlNf MTVWaXNpYmxlUG9zaXRpb25FUzJfCiBfX1pON1dlYkNvcmUxMUJpZGlDb250ZXh0NDFjb3B5U3Rh Y2tSZW1vdmluZ1VuaWNvZGVFbWJlZGRpbmdDb250ZXh0c0V2CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxWaWV3LmgKaW5kZXggOGYzZDg3NjU5Y2NjZTVjY2IxOWIyNWZiN2UyZWExMWIwMzMwZjA4 Mi4uNTUzZGE1NmFhMGFlODFlZDMzNzEyYTBkZDkyODEwYjI0MGZiNDNhNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtMTg2LDcgKzE4Niw3IEBAIHB1YmxpYzoKIAogICAg IC8vIFRoZSBnaXZlbiByZWN0cyBhcmUgb25seSB1c2VkIGlmIHRoZXJlIGlzIG5vIHBsYXRmb3Jt IHdpZGdldC4KICAgICB2b2lkIHNldEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBJbnRSZWN0Jik7 Ci0gICAgdm9pZCBzZXRVbm9ic2N1cmVkQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYpOworICAg IHZvaWQgc2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKGNvbnN0IEludFNpemUmKTsKIAogICAgIHZv aWQgc2V0QWN0dWFsU2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmKTsKICAgICBMZWdhY3lU aWxlQ2FjaGUqIGxlZ2FjeVRpbGVDYWNoZSgpOwpAQCAtNDI3LDEwICs0MjcsMTAgQEAgcHJpdmF0 ZToKICAgICBib29sIG1fY2FuQmxpdE9uU2Nyb2xsOwogCiAgICAgLy8gRklYTUU6IGV4cG9zZWRD b250ZW50UmVjdCBpcyBhIHZlcnkgc2ltaWxhciBjb25jZXB0IHRvIGZpeGVkVmlzaWJsZUNvbnRl bnRSZWN0IGV4Y2VwdCBpdCBkb2VzIG5vdCBkaWZmZXJlbnRpYXRlCi0gICAgLy8gYmV0d2VlbiBl eHBvc2VkIHJlY3QgYW5kIHVub2JzY3VyZWRSZWN0cy4gVGhlIHR3byBhdHRyaWJ1dGVzIHNob3Vs ZCBldmVudHVhbGx5IGJlIG1lcmdlZC4KKyAgICAvLyBiZXR3ZWVuIGV4cG9zZWQgYW5kIHVub2Jz Y3VyZWQgYXJlYXMuIFRoZSB0d28gYXR0cmlidXRlcyBzaG91bGQgZXZlbnR1YWxseSBiZSBtZXJn ZWQuCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIEludFJlY3QgbV9leHBvc2VkQ29udGVudFJlY3Q7 Ci0gICAgSW50UmVjdCBtX3Vub2JzY3VyZWRDb250ZW50UmVjdDsKKyAgICBJbnRTaXplIG1fdW5v YnNjdXJlZENvbnRlbnRTaXplOwogI2Vsc2UKICAgICBJbnRSZWN0IG1fZml4ZWRWaXNpYmxlQ29u dGVudFJlY3Q7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lv cy9TY3JvbGxWaWV3SU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZp ZXdJT1MubW0KaW5kZXggMzljZGViZTdlOWE2ODhlNmYzZjFkOGNkZDZkNjQ4NDNhMWI3NDVjYS4u YTRhMzc4OTJmM2RhMTQxNzI0MjdjODljZGZhODE3MTZmMjViZmE3ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0KQEAgLTEwNywxNiArMTA3LDE2IEBA IEludFJlY3QgU2Nyb2xsVmlldzo6dW5vYnNjdXJlZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50 UmVjdEluY2x1ZGVzU2Nyb2xsYmFycykKICAgICAgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3Qo cik7CiAgICAgfQogCi0gICAgaWYgKCFtX3Vub2JzY3VyZWRDb250ZW50UmVjdC5pc0VtcHR5KCkp Ci0gICAgICAgIHJldHVybiBtX3Vub2JzY3VyZWRDb250ZW50UmVjdDsKKyAgICBpZiAoIW1fdW5v YnNjdXJlZENvbnRlbnRTaXplLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEludFJlY3QoSW50 UG9pbnQobV9zY3JvbGxPZmZzZXQpLCBtX3Vub2JzY3VyZWRDb250ZW50U2l6ZSk7CiAKICAgICBy ZXR1cm4gdW5vYnNjdXJlZENvbnRlbnRSZWN0SW50ZXJuYWwoKTsKIH0KIAotdm9pZCBTY3JvbGxW aWV3OjpzZXRVbm9ic2N1cmVkQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKK3ZvaWQg U2Nyb2xsVmlldzo6c2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKGNvbnN0IEludFNpemUmIHNpemUp CiB7CiAgICAgQVNTRVJUKCFwbGF0Zm9ybVdpZGdldCgpKTsKLSAgICBtX3Vub2JzY3VyZWRDb250 ZW50UmVjdCA9IHJlY3Q7CisgICAgbV91bm9ic2N1cmVkQ29udGVudFNpemUgPSBzaXplOwogfQog CiBJbnRSZWN0IFNjcm9sbFZpZXc6OmV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5k ZXggMzUxMmJhOGRhZTgyYjlmN2ZjNWQzMzNkMmM4NTVjM2Y4NmFiMjUxNC4uNzBjNWI5OWY2MjVh ZTkxYmE3MzdmZjJhYTlhNTAzM2FhOGYyYTBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjEyOSw3ICsyMTI5LDcg QEAgdm9pZCBXZWJQYWdlOjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6 ZSYgbWluaW11bUxheW91dFNpemUsIGNvbnMKICAgICBmcmFtZVZpZXcuc2V0U2Nyb2xsVmVsb2Np dHkoMCwgMCwgMCwgbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkpOwogCiAgICAgSW50UmVj dCByb3VuZGVkVW5vYnNjdXJlZENvbnRlbnRSZWN0ID0gcm91bmRlZEludFJlY3QobmV3VW5vYnNj dXJlZENvbnRlbnRSZWN0KTsKLSAgICBmcmFtZVZpZXcuc2V0VW5vYnNjdXJlZENvbnRlbnRSZWN0 KHJvdW5kZWRVbm9ic2N1cmVkQ29udGVudFJlY3QpOworICAgIGZyYW1lVmlldy5zZXRVbm9ic2N1 cmVkQ29udGVudFNpemUocm91bmRlZFVub2JzY3VyZWRDb250ZW50UmVjdC5zaXplKCkpOwogICAg IG1fZHJhd2luZ0FyZWEtPnNldEV4cG9zZWRDb250ZW50UmVjdChuZXdFeHBvc2VkQ29udGVudFJl Y3QpOwogCiAgICAgc2NhbGVQYWdlKHNjYWxlLCByb3VuZGVkVW5vYnNjdXJlZENvbnRlbnRSZWN0 LmxvY2F0aW9uKCkpOwpAQCAtMjE4NCwxMyArMjE4NCwxMiBAQCB2b2lkIFdlYlBhZ2U6OnZpZXdw b3J0Q29uZmlndXJhdGlvbkNoYW5nZWQoKQogICAgICAgICBGbG9hdFNpemUgbWluaW11bUxheW91 dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcyA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmFj dGl2ZU1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoKTsKICAgICAgICAg bWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcy5zY2FsZSgxIC8gc2NhbGUp OwogICAgICAgICBJbnRTaXplIG1pbmltdW1MYXlvdXRTaXplSW5Eb2N1bWVudENvb3JkaW5hdGVz ID0gcm91bmRlZEludFNpemUobWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRl cyk7Ci0gICAgICAgIEludFJlY3QgdW5vYnNjdXJlZENvbnRlbnRSZWN0KHNjcm9sbFBvc2l0aW9u LCBtaW5pbXVtTGF5b3V0U2l6ZUluRG9jdW1lbnRDb29yZGluYXRlcyk7Ci0gICAgICAgIGZyYW1l Vmlldy5zZXRVbm9ic2N1cmVkQ29udGVudFJlY3QodW5vYnNjdXJlZENvbnRlbnRSZWN0KTsKKyAg ICAgICAgZnJhbWVWaWV3LnNldFVub2JzY3VyZWRDb250ZW50U2l6ZShtaW5pbXVtTGF5b3V0U2l6 ZUluRG9jdW1lbnRDb29yZGluYXRlcyk7CiAgICAgICAgIGZyYW1lVmlldy5zZXRTY3JvbGxWZWxv Y2l0eSgwLCAwLCAwLCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7CiAKICAgICAgICAg Ly8gRklYTUU6IFdlIGNvdWxkIHNlbmQgZG93biB0aGUgb2JzY3VyZWQgbWFyZ2lucyB0byBmaW5k IGEgYmV0dGVyIGV4cG9zZWQgcmVjdCBhbmQgdW5vYnNjdXJlZCByZWN0LgogICAgICAgICAvLyBJ dCBpcyBub3QgYSBiaWcgZGVhbCBhdCB0aGUgbW9tZW50IGJlY2F1c2UgdGhlIHRpbGUgY292ZXJh Z2Ugd2lsbCBhbHdheXMgZXh0ZW5kIHBhc3QgdGhlIG9ic2N1cmVkIGJvdHRvbSBpbnNldC4KLSAg ICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0RXhwb3NlZENvbnRlbnRSZWN0KHVub2JzY3VyZWRDb250 ZW50UmVjdCk7CisgICAgICAgIG1fZHJhd2luZ0FyZWEtPnNldEV4cG9zZWRDb250ZW50UmVjdChJ bnRSZWN0KHNjcm9sbFBvc2l0aW9uLCBtaW5pbXVtTGF5b3V0U2l6ZUluRG9jdW1lbnRDb29yZGlu YXRlcykpOwogICAgIH0KICAgICBzY2FsZVBhZ2Uoc2NhbGUsIHNjcm9sbFBvc2l0aW9uKTsKICAg ICAKQEAgLTIyOTcsMTAgKzIyOTYsMTAgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIHZpc2kKICAgICB9 CiAKICAgICBGcmFtZVZpZXcmIGZyYW1lVmlldyA9ICptX3BhZ2UtPm1haW5GcmFtZSgpLnZpZXco KTsKLSAgICBpZiAoc2Nyb2xsUG9zaXRpb24gIT0gSW50UG9pbnQoZnJhbWVWaWV3LnNjcm9sbE9m ZnNldCgpKSkKKyAgICBpZiAoc2Nyb2xsUG9zaXRpb24gIT0gZnJhbWVWaWV3LnNjcm9sbFBvc2l0 aW9uKCkpCiAgICAgICAgIG1fZHluYW1pY1NpemVVcGRhdGVIaXN0b3J5LmNsZWFyKCk7CiAKLSAg ICBmcmFtZVZpZXcuc2V0VW5vYnNjdXJlZENvbnRlbnRSZWN0KHJvdW5kZWRVbm9ic2N1cmVkUmVj dCk7CisgICAgZnJhbWVWaWV3LnNldFVub2JzY3VyZWRDb250ZW50U2l6ZShyb3VuZGVkVW5vYnNj dXJlZFJlY3Quc2l6ZSgpKTsKIAogICAgIGRvdWJsZSBob3Jpem9udGFsVmVsb2NpdHkgPSB2aXNp YmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmhvcml6b250YWxWZWxvY2l0eSgpOwogICAgIGRvdWJs ZSB2ZXJ0aWNhbFZlbG9jaXR5ID0gdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby52ZXJ0aWNh bFZlbG9jaXR5KCk7Cg==