196282 2019-03-26 18:08:04 -0700 Fix some more deprecation warnings in WKDrawingView 2019-03-27 11:40:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin commit-queue dino simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1521570 0 thorton 2019-03-26 18:08:04 -0700 Fix some more deprecation warnings in WKDrawingView 1521574 1 366032 thorton 2019-03-26 18:15:03 -0700 Created attachment 366032 Patch 1521584 2 366032 wenson_hsieh 2019-03-26 18:46:57 -0700 Comment on attachment 366032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366032&action=review > Source/WebKit/UIProcess/ios/WKDrawingCoordinator.mm:35 > +#import <WebKitAdditions/WKDrawingCoordinatorAdditions.mm> Nit - may consider a #if USE(APPLE_INTERNAL_SDK) here, though it's probably not necessary since HAVE(PENCILKIT) is off in all non-internal SDKs, and probably by the time that's no longer the case you would've already moved the code into open source :) 1521754 3 366032 commit-queue 2019-03-27 11:23:05 -0700 Comment on attachment 366032 Patch Clearing flags on attachment: 366032 Committed r243553: <https://trac.webkit.org/changeset/243553> 1521755 4 commit-queue 2019-03-27 11:23:06 -0700 All reviewed patches have been landed. Closing bug. 1521764 5 webkit-bug-importer 2019-03-27 11:40:35 -0700 <rdar://problem/49346030> 366032 2019-03-26 18:15:03 -0700 2019-03-27 11:23:05 -0700 Patch bug-196282-20190326181502.patch text/plain 19357 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNmOWRlMmU4MzE4YzdhZjgw NzMyNWQyZTlhYjdjNGY2MmI2ZjU2MzIuLjdmNmIwZDBkNzNmNTM3MDg3YTU1MTBiMTMzMTg0NGUx YjZlYTE5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMDMtMjYgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHNvbWUgbW9yZSBk ZXByZWNhdGlvbiB3YXJuaW5ncyBpbiBXS0RyYXdpbmdWaWV3CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYyODIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQ3NjM3NjA4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9QZW5jaWxLaXRTUEkuaDoKKyAgICAgICAgKiBTb3Vy Y2VzQ29jb2EudHh0OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGVuY2lsS2l0U29mdExpbmsu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1BlbmNpbEtpdFNvZnRMaW5rLm1tOgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLRHJhd2luZ0Nvb3JkaW5hdG9yLm1tOgorICAgICAgICAoLVtXS0RyYXdpbmdDb29y ZGluYXRvciBpbml0V2l0aENvbnRlbnRWaWV3Ol0pOgorICAgICAgICAoLVtXS0RyYXdpbmdDb29y ZGluYXRvciBjdXJyZW50SW5rXSk6CisgICAgICAgICgtW1dLRHJhd2luZ0Nvb3JkaW5hdG9yIHVu ZG9NYW5hZ2VyRm9ySW5rUGlja2VyOl0pOgorICAgICAgICAoLVtXS0RyYXdpbmdDb29yZGluYXRv ciBjb250YWluaW5nVmlld0Zvcklua1BpY2tlcjpdKToKKyAgICAgICAgKC1bV0tEcmF3aW5nQ29v cmRpbmF0b3IgaW5rUGlja2VyRGlkVG9nZ2xlUnVsZXI6XSk6CisgICAgICAgICgtW1dLRHJhd2lu Z0Nvb3JkaW5hdG9yIGlua1BpY2tlckRpZENoYW5nZUluazpdKToKKyAgICAgICAgKC1bV0tEcmF3 aW5nQ29vcmRpbmF0b3IgaW5zdGFsbElua1BpY2tlckZvckRyYXdpbmc6XSk6CisgICAgICAgICgt W1dLRHJhd2luZ0Nvb3JkaW5hdG9yIHVuaW5zdGFsbElua1BpY2tlcl0pOgorICAgICAgICAoLVtX S0RyYXdpbmdDb29yZGluYXRvciBpbmtQaWNrZXJdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tE cmF3aW5nQ29vcmRpbmF0b3IgZGlkQ2hhbmdlUnVsZXJTdGF0ZTpdKTogRGVsZXRlZC4KKyAgICAg ICAgKC1bV0tEcmF3aW5nQ29vcmRpbmF0b3IgZGlkQ2hhbmdlSW5rOl0pOiBEZWxldGVkLgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nVmlldy5tbToKKyAgICAgICAgKC1bV0tEcmF3 aW5nVmlldyBfY2FudmFzVmlld1dpbGxCZWdpbkRyYXdpbmc6XSk6CisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0lua1BpY2tlclZpZXcuaDogUmVtb3ZlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLSW5rUGlja2VyVmlldy5tbTogUmVtb3ZlZC4KKyAgICAgICAgKiBXZWJLaXQueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRvcHQgdGhlIG5ldyBuYW1lcy4KKwogMjAx OS0wMy0yNiAgVG9tb2tpIEltYWkgIDxUb21va2kuSW1haUBzb255LmNvbT4KIAogICAgICAgICBB c3NlcnRpb24gZmFpbHVyZSAhaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkgaW4gRHJh d2luZ0FyZWFQcm94eUNvb3JkaW5hdGVkR3JhcGhpY3M6OmluY29ycG9yYXRlVXBkYXRlIHdoZW4g Zm9yY2VDb21wb3NpdGluZ01vZGUgaXMgdHVybmVkIG9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtL3NwaS9pb3MvUGVuY2lsS2l0U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtL3NwaS9pb3MvUGVuY2lsS2l0U1BJLmgKaW5kZXggNThmNjZlMjNkNmFkYTg0NDBjMzMyYmU3 MTY3NjM2MDJkOGI2YWUyZC4uY2M0NDkxY2VhNTU3YTk3NTdhN2RkNGUxODM3OWM4OWI1NjEzMWQ3 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1BlbmNpbEtpdFNQ SS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9QZW5jaWxLaXRTUEkuaApA QCAtMzEsOCArMzEsNiBAQAogI2ltcG9ydCA8UGVuY2lsS2l0L1BLQ2FudmFzVmlld19Qcml2YXRl Lmg+CiAjaW1wb3J0IDxQZW5jaWxLaXQvUEtEcmF3aW5nX1ByaXZhdGUuaD4KICNpbXBvcnQgPFBl bmNpbEtpdC9QS0ltYWdlUmVuZGVyZXIuaD4KLSNpbXBvcnQgPFBlbmNpbEtpdC9QS0lubGluZUlu a1BpY2tlci5oPgotI2ltcG9ydCA8UGVuY2lsS2l0L1BLSW5saW5lSW5rUGlja2VyX1ByaXZhdGUu aD4KICNpbXBvcnQgPFBlbmNpbEtpdC9QS1N0cm9rZS5oPgogCiAjZWxzZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29j b2EudHh0CmluZGV4IDllMzc1MmFiMGNjMWY4MGY5ZGQ5ZDI5NjY5ODdmY2U2NzI2NGUwYzkuLjM1 MTE2NGZhY2FlMjQxOGY3YmUxZWMwM2I2NTdkYzQ5MWM5NzA4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvU291cmNlc0NvY29hLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNDb2Nv YS50eHQKQEAgLTQwNCw3ICs0MDQsNiBAQCBVSVByb2Nlc3MvaW9zL1dLRHJhd2luZ0Nvb3JkaW5h dG9yLm1tCiBVSVByb2Nlc3MvaW9zL1dLRHJhd2luZ1ZpZXcubW0KIFVJUHJvY2Vzcy9pb3MvV0tH ZW9sb2NhdGlvblByb3ZpZGVySU9TLm1tCiBVSVByb2Nlc3MvaW9zL1dLR2VvbG9jYXRpb25Qcm92 aWRlcklPU09iakNTZWN1cml0eU9yaWdpbi5tbQotVUlQcm9jZXNzL2lvcy9XS0lua1BpY2tlclZp ZXcubW0KIFVJUHJvY2Vzcy9pb3MvV0tJbnNwZWN0b3JOb2RlU2VhcmNoR2VzdHVyZVJlY29nbml6 ZXIubW0KIFVJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tCiBVSVBy b2Nlc3MvaW9zL1dLUGFzc3dvcmRWaWV3Lm1tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvUGVuY2lsS2l0U29mdExpbmsuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9QZW5jaWxLaXRTb2Z0TGluay5oCmluZGV4IDRmN2QwZmJkNmI5NTExM2MyOTc1NmM1ZmNl MDNjMDJhMjFkNWUyN2YuLmVkM2M1ZjliOWMyMDg0NTBlZmYwODY2MjliNjE1OTAzOGM3Y2ZiNjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QZW5jaWxLaXRTb2Z0TGlu ay5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QZW5jaWxLaXRTb2Z0TGluay5o CkBAIC0zNCw2ICszNCw1IEBAIFNPRlRfTElOS19GUkFNRVdPUktfRk9SX0hFQURFUihXZWJLaXQs IFBlbmNpbEtpdCk7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX0hFQURFUihXZWJLaXQsIFBLQ2FudmFz Vmlldyk7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX0hFQURFUihXZWJLaXQsIFBLRHJhd2luZyk7CiBT T0ZUX0xJTktfQ0xBU1NfRk9SX0hFQURFUihXZWJLaXQsIFBLSW1hZ2VSZW5kZXJlcik7Ci1TT0ZU X0xJTktfQ0xBU1NfRk9SX0hFQURFUihXZWJLaXQsIFBLSW5saW5lSW5rUGlja2VyKTsKIAogI2Vu ZGlmIC8vIEhBVkUoUEVOQ0lMS0lUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1BlbmNpbEtpdFNvZnRMaW5rLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1BlbmNpbEtpdFNvZnRMaW5rLm1tCmluZGV4IDdmZDM2YmMxZWY4NTg2MjJiMzNmYzRmMGM5OTlk ZmRiYzU0YTgzOTcuLjAyYWZlZWYxYWQ4MWZiZjVkN2Q3ZmQyODU2MWQ4NWJmNjU3Yzk0MjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9QZW5jaWxLaXRTb2Z0TGluay5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUGVuY2lsS2l0U29mdExpbmsubW0K QEAgLTM0LDYgKzM0LDUgQEAgU09GVF9MSU5LX1BSSVZBVEVfRlJBTUVXT1JLX0ZPUl9TT1VSQ0Uo V2ViS2l0LCBQZW5jaWxLaXQpOwogU09GVF9MSU5LX0NMQVNTX0ZPUl9TT1VSQ0UoV2ViS2l0LCBQ ZW5jaWxLaXQsIFBLQ2FudmFzVmlldyk7CiBTT0ZUX0xJTktfQ0xBU1NfRk9SX1NPVVJDRShXZWJL aXQsIFBlbmNpbEtpdCwgUEtEcmF3aW5nKTsKIFNPRlRfTElOS19DTEFTU19GT1JfU09VUkNFKFdl YktpdCwgUGVuY2lsS2l0LCBQS0ltYWdlUmVuZGVyZXIpOwotU09GVF9MSU5LX0NMQVNTX0ZPUl9T T1VSQ0UoV2ViS2l0LCBQZW5jaWxLaXQsIFBLSW5saW5lSW5rUGlja2VyKTsKIAogI2VuZGlmIC8v IEhBVkUoUEVOQ0lMS0lUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMzZiNTcyNzY5ZmEwZmY3NDM0YmNh ZmI4ZTUwYWIwNmUxN2RjZTRiNC4uNDAzZjFjMzdmMGU2MzUyN2VjYTdlNDFjMTk5ZmExYjU1ZTFl MjU2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC00OCw3ICs0OCw2IEBACiAjaW1wb3J0ICJXS0Zvcm1J bnB1dENvbnRyb2wuaCIKICNpbXBvcnQgIldLRm9ybVNlbGVjdENvbnRyb2wuaCIKICNpbXBvcnQg IldLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIuaCIKLSNpbXBvcnQgIldLSW5rUGlja2VyVmll dy5oIgogI2ltcG9ydCAiV0tJbnNwZWN0b3JOb2RlU2VhcmNoR2VzdHVyZVJlY29nbml6ZXIuaCIK ICNpbXBvcnQgIldLTlNVUkxFeHRyYXMuaCIKICNpbXBvcnQgIldLUHJldmlld0FjdGlvbkl0ZW1J ZGVudGlmaWVycy5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL RHJhd2luZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEcmF3 aW5nQ29vcmRpbmF0b3IuaAppbmRleCA4Mjk5NTYzNTgxZGM4OTc3ZTQwNGYzZDljNTI5ODU5NzE1 NWU3NWNiLi5mOTdiNTc0NTI1NGExMDMzOTRhOWY2Y2JhYWJkZjE0MGY0YmVjN2NhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nQ29vcmRpbmF0b3IuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nQ29vcmRpbmF0b3IuaApA QCAtMzAsNyArMzAsNiBAQAogCiBPQkpDX0NMQVNTIFBLSW5rOwogT0JKQ19DTEFTUyBXS0NvbnRl bnRWaWV3OwotT0JKQ19DTEFTUyBXS0lua1BpY2tlclZpZXc7CiAKIEBpbnRlcmZhY2UgV0tEcmF3 aW5nQ29vcmRpbmF0b3IgOiBOU09iamVjdCA8UEtSdWxlckhvc3RpbmdEZWxlZ2F0ZT4KIApAQCAt NDAsMTAgKzM5LDggQEAgT0JKQ19DTEFTUyBXS0lua1BpY2tlclZpZXc7CiAtICh2b2lkKWluc3Rh bGxJbmtQaWNrZXJGb3JEcmF3aW5nOihXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpFbWJlZGRlZFZp ZXdJRCllbWJlZGRlZFZpZXdJRDsKIC0gKHZvaWQpdW5pbnN0YWxsSW5rUGlja2VyOwogCi0tICh2 b2lkKWRpZENoYW5nZVJ1bGVyU3RhdGU6KEJPT0wpcnVsZXJFbmFibGVkOwotLSAodm9pZClkaWRD aGFuZ2VJbms6KFBLSW5rICopaW5rOwotCi1AcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHks IHJldGFpbikgV0tJbmtQaWNrZXJWaWV3ICppbmtQaWNrZXI7CitAcHJvcGVydHkgKG5vbmF0b21p YykgQk9PTCBydWxlckVuYWJsZWQ7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIHJl dGFpbikgUEtJbmsgKmN1cnJlbnRJbms7CiAKIEBlbmQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLRHJhd2luZ0Nvb3JkaW5hdG9yLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLRHJhd2luZ0Nvb3JkaW5hdG9yLm1tCmluZGV4IDEwNzk2ZGZhOTFj MjA5ZTYzYWY4MzNlOTM5MzViMjA5NWMyOTFlZTAuLjQ0MGM3MjM5ZDQyNjYyODA5MmRmMzZmMTlj NzUzZWVjMDZkYWYwMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0RyYXdpbmdDb29yZGluYXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tEcmF3aW5nQ29vcmRpbmF0b3IubW0KQEAgLTMwLDE2ICszMCwyMCBAQAogCiAjaW1wb3J0ICJF ZGl0YWJsZUltYWdlQ29udHJvbGxlci5oIgogI2ltcG9ydCAiV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgiCi0jaW1wb3J0ICJXS0lua1BpY2tlclZpZXcuaCIKKyNpbXBvcnQgIldLRHJhd2luZ1Zp ZXcuaCIKICNpbXBvcnQgIldLV2ViVmlldy5oIgorI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1dL RHJhd2luZ0Nvb3JkaW5hdG9yQWRkaXRpb25zLm1tPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5o PgogCiAjaW1wb3J0ICJQZW5jaWxLaXRTb2Z0TGluay5oIgogCitAaW50ZXJmYWNlIFdLRHJhd2lu Z0Nvb3JkaW5hdG9yICgpIDxXS0lua1BpY2tlckRlbGVnYXRlPgorQGVuZAorCiBAaW1wbGVtZW50 YXRpb24gV0tEcmF3aW5nQ29vcmRpbmF0b3IgewogICAgIF9fd2VhayBXS0NvbnRlbnRWaWV3ICpf Y29udGVudFZpZXc7CiAKLSAgICBSZXRhaW5QdHI8V0tJbmtQaWNrZXJWaWV3PiBfaW5rUGlja2Vy OworICAgIFJldGFpblB0cjxXS0lua1BpY2tlcj4gX2lua1BpY2tlcjsKIAogICAgIFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXI6OkVtYmVkZGVkVmlld0lEIF9mb2N1c2VkRW1iZWRkZWRWaWV3SUQ7CiB9 CkBAIC01MSwxNCArNTUsMTMgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29udGVudFZpZXc6 KFdLQ29udGVudFZpZXcgKiljb250ZW50VmlldwogICAgICAgICByZXR1cm4gbmlsOwogCiAgICAg X2NvbnRlbnRWaWV3ID0gY29udGVudFZpZXc7Ci0gICAgX2lua1BpY2tlciA9IGFkb3B0TlMoW1tX S0lua1BpY2tlclZpZXcgYWxsb2NdIGluaXRXaXRoQ29udGVudFZpZXc6X2NvbnRlbnRWaWV3XSk7 CiAKICAgICByZXR1cm4gc2VsZjsKIH0KIAotLSAoV0tJbmtQaWNrZXJWaWV3ICopaW5rUGlja2Vy CistIChQS0luayAqKWN1cnJlbnRJbmsKIHsKLSAgICByZXR1cm4gX2lua1BpY2tlci5nZXQoKTsK KyAgICByZXR1cm4gW19pbmtQaWNrZXIgY3VycmVudElua107CiB9CiAKIC0gKFVJVmlldyAqKXJ1 bGVySG9zdGluZ1ZpZXcKQEAgLTc5LDQxICs4Miw0NCBAQCAtIChXS0RyYXdpbmdWaWV3ICopX2Zv Y3VzZWREcmF3aW5nVmlldwogICAgIHJldHVybiBmb2N1c2VkRWRpdGFibGVJbWFnZS0+ZHJhd2lu Z1ZpZXcuZ2V0KCk7CiB9CiAKLS0gKHZvaWQpZGlkQ2hhbmdlUnVsZXJTdGF0ZTooQk9PTClydWxl ckVuYWJsZWQKKy0gKE5TVW5kb01hbmFnZXIgKil1bmRvTWFuYWdlckZvcklua1BpY2tlcjooV0tJ bmtQaWNrZXIgKilpbmtQaWNrZXIKIHsKLSAgICBbc2VsZi5fZm9jdXNlZERyYXdpbmdWaWV3IGRp ZENoYW5nZVJ1bGVyU3RhdGU6cnVsZXJFbmFibGVkXTsKKyAgICByZXR1cm4gW19jb250ZW50Vmll dyB1bmRvTWFuYWdlcl07CiB9CiAKLS0gKHZvaWQpZGlkQ2hhbmdlSW5rOihQS0luayAqKWluawor LSAoVUlWaWV3ICopY29udGFpbmluZ1ZpZXdGb3JJbmtQaWNrZXI6KFdLSW5rUGlja2VyICopaW5r UGlja2VyCiB7Ci0gICAgW3NlbGYuX2ZvY3VzZWREcmF3aW5nVmlldyBkaWRDaGFuZ2VJbms6aW5r XTsKKyAgICByZXR1cm4gX2NvbnRlbnRWaWV3OwogfQogCi0tICh2b2lkKWluc3RhbGxJbmtQaWNr ZXJGb3JEcmF3aW5nOihXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpFbWJlZGRlZFZpZXdJRCllbWJl ZGRlZFZpZXdJRAorLSAodm9pZClpbmtQaWNrZXJEaWRUb2dnbGVSdWxlcjooV0tJbmtQaWNrZXIg KilpbmtQaWNrZXIKIHsKLSAgICBfZm9jdXNlZEVtYmVkZGVkVmlld0lEID0gZW1iZWRkZWRWaWV3 SUQ7CisgICAgX3J1bGVyRW5hYmxlZCA9ICFfcnVsZXJFbmFibGVkOworICAgIFtzZWxmLl9mb2N1 c2VkRHJhd2luZ1ZpZXcgZGlkQ2hhbmdlUnVsZXJTdGF0ZTpfcnVsZXJFbmFibGVkXTsKK30KIAot ICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IF9jb250ZW50Vmlldy0+X3dlYlZpZXc7CistICh2b2lk KWlua1BpY2tlckRpZENoYW5nZUluazooV0tJbmtQaWNrZXIgKilpbmtQaWNrZXIKK3sKKyAgICBb c2VsZi5fZm9jdXNlZERyYXdpbmdWaWV3IGRpZENoYW5nZUluazpzZWxmLmN1cnJlbnRJbmtdOwor fQogCi0gICAgW19pbmtQaWNrZXIgc2l6ZVRvRml0XTsKLSAgICBbX2lua1BpY2tlciBzZXRUcmFu c2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50czpOT107Ci0gICAgW3dlYlZpZXcg YWRkU3VidmlldzpfaW5rUGlja2VyLmdldCgpXTsKKy0gKHZvaWQpaW5zdGFsbElua1BpY2tlckZv ckRyYXdpbmc6KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OkVtYmVkZGVkVmlld0lEKWVtYmVkZGVk Vmlld0lECit7CisgICAgX2ZvY3VzZWRFbWJlZGRlZFZpZXdJRCA9IGVtYmVkZGVkVmlld0lEOwog Ci0gICAgW05TTGF5b3V0Q29uc3RyYWludCBhY3RpdmF0ZUNvbnN0cmFpbnRzOkBbCi0gICAgICAg IFtbX2lua1BpY2tlciBoZWlnaHRBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQ29uc3RhbnQ6W19p bmtQaWNrZXIgZnJhbWVdLnNpemUuaGVpZ2h0XSwKLSAgICAgICAgW1tfaW5rUGlja2VyIGJvdHRv bUFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6d2ViVmlldy5zYWZlQXJlYUxheW91dEd1 aWRlLmJvdHRvbUFuY2hvcl0sCi0gICAgICAgIFtbX2lua1BpY2tlciBsZWZ0QW5jaG9yXSBjb25z dHJhaW50RXF1YWxUb0FuY2hvcjp3ZWJWaWV3LnNhZmVBcmVhTGF5b3V0R3VpZGUubGVmdEFuY2hv cl0sCi0gICAgICAgIFtbX2lua1BpY2tlciByaWdodEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9B bmNob3I6d2ViVmlldy5zYWZlQXJlYUxheW91dEd1aWRlLnJpZ2h0QW5jaG9yXSwKLSAgICBdXTsK KyAgICBpZiAoIV9pbmtQaWNrZXIpCisgICAgICAgIF9pbmtQaWNrZXIgPSBhZG9wdE5TKFtbV0tJ bmtQaWNrZXIgYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZl0pOworICAgIFtfaW5rUGlja2Vy IHNob3ddOwogCiAgICAgLy8gV2hlbiBmb2N1c2VkLCBwdXNoIHRoZSBydWxlciBzdGF0ZSBkb3du IHRvIHRoZSBjYW52YXMgc28gdGhhdCBpdCBkb2Vzbid0IGdldCBvdXQgb2Ygc3luYwogICAgIC8v IGFuZCBlYXJseS1yZXR1cm4gZnJvbSBsYXRlciBjaGFuZ2VzLgotICAgIFtzZWxmLl9mb2N1c2Vk RHJhd2luZ1ZpZXcgZGlkQ2hhbmdlUnVsZXJTdGF0ZTpbX2lua1BpY2tlciBydWxlckVuYWJsZWRd XTsKKyAgICBbc2VsZi5fZm9jdXNlZERyYXdpbmdWaWV3IGRpZENoYW5nZVJ1bGVyU3RhdGU6X3J1 bGVyRW5hYmxlZF07CiB9CiAKIC0gKHZvaWQpdW5pbnN0YWxsSW5rUGlja2VyCiB7Ci0gICAgW19p bmtQaWNrZXIgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgW19pbmtQaWNrZXIgaGlkZV07Cisg ICAgW3NlbGYuX2ZvY3VzZWREcmF3aW5nVmlldyBkaWRDaGFuZ2VSdWxlclN0YXRlOk5PXTsKICAg ICBfZm9jdXNlZEVtYmVkZGVkVmlld0lEID0gMDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLRHJhd2luZ1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tEcmF3aW5nVmlldy5tbQppbmRleCA1M2YyNDg4MGFkNjJmYzYxODYxY2NkNjhi NTlmNjdmZTY1ZmY3ZDE5Li42YmVkMTAzNzMzOTA0ODdkZjdjZGQ1NWZmY2E0MThkYjQ1YmJlOGQy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEcmF3aW5nVmlldy5tbQpAQCAt MzEsNyArMzEsNiBAQAogI2ltcG9ydCAiRWRpdGFibGVJbWFnZUNvbnRyb2xsZXIuaCIKICNpbXBv cnQgIldLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIgogI2ltcG9ydCAiV0tEcmF3aW5nQ29vcmRp bmF0b3IuaCIKLSNpbXBvcnQgIldLSW5rUGlja2VyVmlldy5oIgogI2ltcG9ydCA8d3RmL09TT2Jq ZWN0UHRyLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKQEAgLTE3Myw3ICsxNzIsNyBA QCAtICh2b2lkKWNhbnZhc1ZpZXdEcmF3aW5nRGlkQ2hhbmdlOihQS0NhbnZhc1ZpZXcgKiljYW52 YXNWaWV3CiAtICh2b2lkKV9jYW52YXNWaWV3V2lsbEJlZ2luRHJhd2luZzooUEtDYW52YXNWaWV3 ICopY2FudmFzVmlldwogewogQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAg ICBbX3BlbmNpbFZpZXcgc2V0SW5rOl9jb250ZW50Vmlldy5fZHJhd2luZ0Nvb3JkaW5hdG9yLmlu a1BpY2tlci5pbmtdOworICAgIFtfcGVuY2lsVmlldyBzZXRJbms6X2NvbnRlbnRWaWV3Ll9kcmF3 aW5nQ29vcmRpbmF0b3IuY3VycmVudElua107CiBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19FTkQKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLSW5r UGlja2VyVmlldy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLSW5rUGlja2VyVmll dy5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzZjZkN2JjMzJhZWM2NmZiYTdiNDQ4 OWM2YzA0YWJjYTM0N2QzNGZiLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwCi0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0lua1BpY2tlclZpZXcuaAor KysgL2Rldi9udWxsCkBAIC0xLDQ2ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09G VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFT IElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVU T1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBT UEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT Ci0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJ QUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YK LSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaWYgSEFWRShQRU5D SUxLSVQpCi0KLSNpbXBvcnQgPFVJS2l0L1VJS2l0Lmg+Ci0KLU9CSkNfQ0xBU1MgUEtJbms7Ci1P QkpDX0NMQVNTIFdLQ29udGVudFZpZXc7Ci0KLUBpbnRlcmZhY2UgV0tJbmtQaWNrZXJWaWV3IDog VUlWaWV3Ci0KLS0gKGluc3RhbmNldHlwZSlpbml0IE5TX1VOQVZBSUxBQkxFOwotLSAoaW5zdGFu Y2V0eXBlKWluaXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZSBOU19VTkFWQUlMQUJMRTsKLS0gKGlu c3RhbmNldHlwZSlpbml0V2l0aENvZGVyOihOU0NvZGVyICopY29kZXIgTlNfVU5BVkFJTEFCTEU7 Ci0KLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICop Y29udGVudFZpZXcgTlNfREVTSUdOQVRFRF9JTklUSUFMSVpFUjsKLQotQHByb3BlcnR5IChub25h dG9taWMpIEJPT0wgcnVsZXJFbmFibGVkOwotQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbikg UEtJbmsgKmluazsKLQotQGVuZAotCi0jZW5kaWYgLy8gSEFWRShQRU5DSUxLSVQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tJbmtQaWNrZXJWaWV3Lm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLSW5rUGlja2VyVmlldy5tbQpkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMWMyOTI5ZGNhNTIwMjYzOTU2NGUwMzA4ODM3OGE3YzMyZGE2YTU0 Yi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tJbmtQaWNrZXJWaWV3Lm1tCisrKyAvZGV2L251bGwKQEAg LTEsMTE1ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTggQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUg bWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW1wb3J0ICJjb25maWcuaCIKLSNpbXBvcnQg IldLSW5rUGlja2VyVmlldy5oIgotCi0jaWYgSEFWRShQRU5DSUxLSVQpCi0KLSNpbXBvcnQgIldL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oIgotI2ltcG9ydCAiV0tEcmF3aW5nQ29vcmRpbmF0b3Iu aCIKLQotI2ltcG9ydCAiUGVuY2lsS2l0U29mdExpbmsuaCIKLQotQGludGVyZmFjZSBXS0lua1Bp Y2tlclZpZXcgKCkgPFBLSW5saW5lSW5rUGlja2VyRGVsZWdhdGU+Ci1AZW5kCi0KLUBpbXBsZW1l bnRhdGlvbiBXS0lua1BpY2tlclZpZXcgewotICAgIFJldGFpblB0cjxQS0lubGluZUlua1BpY2tl cj4gX2lubGluZVBpY2tlcjsKLSAgICBfX3dlYWsgV0tDb250ZW50VmlldyAqX2NvbnRlbnRWaWV3 OwotfQotCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb250ZW50VmlldzooV0tDb250ZW50Vmll dyAqKWNvbnRlbnRWaWV3Ci17Ci0gICAgc2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOkNHUmVj dFplcm9dOwotICAgIGlmICghc2VsZikKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIF9pbmxp bmVQaWNrZXIgPSBhZG9wdE5TKFtXZWJLaXQ6OmFsbG9jUEtJbmxpbmVJbmtQaWNrZXJJbnN0YW5j ZSgpIGluaXRdKTsKLSAgICBbX2lubGluZVBpY2tlciBzZXREZWxlZ2F0ZTpzZWxmXTsKLQotICAg IF9jb250ZW50VmlldyA9IGNvbnRlbnRWaWV3OwotICAgIFtzZWxmIGFkZFN1YnZpZXc6X2lubGlu ZVBpY2tlci5nZXQoKV07Ci0KLSAgICByZXR1cm4gc2VsZjsKLX0KLQotLSAodm9pZClkaWRQaWNr SW5rCi17Ci0gICAgW19jb250ZW50Vmlldy5fZHJhd2luZ0Nvb3JkaW5hdG9yIGRpZENoYW5nZUlu azpbX2lubGluZVBpY2tlciBzZWxlY3RlZElua11dOwotfQotCi0tICh2b2lkKWlubGluZUlua1Bp Y2tlckRpZFRvZ2dsZVJ1bGVyOihQS0lubGluZUlua1BpY2tlciAqKWlubGluZUlua1BpY2tlcgot ewotICAgIF9ydWxlckVuYWJsZWQgPSAhX3J1bGVyRW5hYmxlZDsKLSAgICBbX2NvbnRlbnRWaWV3 Ll9kcmF3aW5nQ29vcmRpbmF0b3IgZGlkQ2hhbmdlUnVsZXJTdGF0ZTpfcnVsZXJFbmFibGVkXTsK LX0KLQotLSAodm9pZClpbmxpbmVJbmtQaWNrZXI6KFBLSW5saW5lSW5rUGlja2VyICopaW5saW5l SW5rUGlja2VyIGRpZFNlbGVjdFRvb2w6KFBLSW5rSWRlbnRpZmllcilpZGVudGlmZXIKLXsKLSAg ICBbc2VsZiBkaWRQaWNrSW5rXTsKLX0KLQotLSAodm9pZClpbmxpbmVJbmtQaWNrZXI6KFBLSW5s aW5lSW5rUGlja2VyICopaW5saW5lSW5rUGlja2VyIGRpZFNlbGVjdENvbG9yOihVSUNvbG9yICop Y29sb3IKLXsKLSAgICBbc2VsZiBkaWRQaWNrSW5rXTsKLX0KLQotLSAoQ0dTaXplKWlua1BpY2tl clNpemUKLXsKLSAgICBDR1NpemUga2V5Ym9hcmRTaXplID0gW1VJS2V5Ym9hcmQgZGVmYXVsdFNp emVGb3JJbnRlcmZhY2VPcmllbnRhdGlvbjpbVUlBcHAgaW50ZXJmYWNlT3JpZW50YXRpb25dXTsK LSAgICByZXR1cm4gW19pbmxpbmVQaWNrZXIgc2l6ZVRoYXRGaXRzOmtleWJvYXJkU2l6ZV07Ci19 Ci0KLS0gKHZvaWQpbGF5b3V0U3Vidmlld3MKLXsKLSAgICBDR1NpemUgcGlja2VyU2l6ZSA9IHNl bGYuaW5rUGlja2VyU2l6ZTsKLSAgICBbX2lubGluZVBpY2tlciBzZXRGcmFtZTpDR1JlY3RNYWtl KENHUmVjdEdldE1pZFgoc2VsZi5ib3VuZHMpIC0gKHBpY2tlclNpemUud2lkdGggLyAyKSwgMCwg cGlja2VyU2l6ZS53aWR0aCwgcGlja2VyU2l6ZS5oZWlnaHQpXTsKLX0KLQotLSAoQ0dTaXplKXNp emVUaGF0Rml0czooQ0dTaXplKXNpemUKLXsKLSAgICBDR1NpemUga2V5Ym9hcmRTaXplID0gW1VJ S2V5Ym9hcmQgZGVmYXVsdFNpemVGb3JJbnRlcmZhY2VPcmllbnRhdGlvbjpbVUlBcHAgaW50ZXJm YWNlT3JpZW50YXRpb25dXTsKLSAgICByZXR1cm4gQ0dTaXplTWFrZShrZXlib2FyZFNpemUud2lk dGgsIHNlbGYuaW5rUGlja2VyU2l6ZS5oZWlnaHQpOwotfQotCi0tIChVSVZpZXdDb250cm9sbGVy ICopdmlld0NvbnRyb2xsZXJGb3JQb3BvdmVyUHJlc2VudGF0aW9uRnJvbUlubGluZUlua1BpY2tl cjooUEtJbmxpbmVJbmtQaWNrZXIgKilpbmxpbmVJbmtQaWNrZXIKLXsKLSAgICByZXR1cm4gW1VJ Vmlld0NvbnRyb2xsZXIgX3ZpZXdDb250cm9sbGVyRm9yRnVsbFNjcmVlblByZXNlbnRhdGlvbkZy b21WaWV3Ol9jb250ZW50Vmlld107Ci19Ci0KLS0gKHZvaWQpc2V0SW5rOihQS0luayAqKWluawot ewotICAgIFtfaW5saW5lUGlja2VyIHNldFNlbGVjdGVkSW5rOmlua107Ci19Ci0KLS0gKFBLSW5r ICopaW5rCi17Ci0gICAgcmV0dXJuIFtfaW5saW5lUGlja2VyIHNlbGVjdGVkSW5rXTsKLX0KLQot QGVuZAotCi0jZW5kaWYgLy8gSEFWRShQRU5DSUxLSVQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAwOTg2M2VlNDg2MWEzY2M0YzgyZjZh YjI1MjBjOGQ1N2VhYTdmMTNmLi4yNGY2YTg0NDg3MzU1NmI0NTBjYTU3MmE3MDZmOTQzOGZiNTE1 ZDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKQEAgLTI4MTAsOCArMjgxMCw2IEBACiAJCTJERTlCMTM4MjIzMUY2MUMwMDUyODdCNyAvKiBf V0tUZXh0SW5wdXRDb250ZXh0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IF9X S1RleHRJbnB1dENvbnRleHQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkRFOUIx M0IyMjMxRjc3QzAwNTI4N0I3IC8qIF9XS1RleHRJbnB1dENvbnRleHRJbnRlcm5hbC5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBfV0tUZXh0SW5wdXRDb250ZXh0SW50ZXJuYWwu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkRFQUM1Q0UxQUMzNjhCQjAwQTE5NUQ4 IC8qIF9XS0ZpbmRPcHRpb25zLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IF9X S0ZpbmRPcHRpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTJERjM5NjJBMjFD OERDNTAwMDg4MzVFMyAvKiBXS0lua1BpY2tlclZpZXcubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUg PSBXS0lua1BpY2tlclZpZXcubW07IHBhdGggPSBpb3MvV0tJbmtQaWNrZXJWaWV3Lm1tOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwotCQkyREYzOTYyQjIxQzhEQzUwMDA4ODM1RTMgLyogV0tJ bmtQaWNrZXJWaWV3LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFdLSW5rUGlja2VyVmlldy5oOyBwYXRoID0g aW9zL1dLSW5rUGlja2VyVmlldy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyREY5 NTkzNDE4QTQyNDEyMDA5Nzg1QTEgLyogVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gVmlld0dlc3R1cmVDb250cm9sbGVy SU9TLm1tOyBwYXRoID0gaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkRGOUVFRTMxQTc4MUZCNDAwQjZDRkJFIC8qIEFQSUZyYW1l SW5mby5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBUElGcmFtZUlu Zm8uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyREY5RUVFNDFBNzgxRkI0MDBC NkNGQkUgLyogQVBJRnJhbWVJbmZvLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IEFQSUZyYW1lSW5mby5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNTkyMyw4ICs1 OTIxLDYgQEAKIAkJCQkwRkNCNEU0MTE4QkJFMDQ0MDAwRkNGQzkgLyogV0tHZW9sb2NhdGlvblBy b3ZpZGVySU9TT2JqQ1NlY3VyaXR5T3JpZ2luLm1tICovLAogCQkJCTkzM0RGODJEMUIzQkMwOTAw MEFFQTlFMyAvKiBXS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmggKi8sCiAJCQkJOTMzREY4 MkYxQjNCQzBCNDAwQUVBOUUzIC8qIFdLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIubW0gKi8s Ci0JCQkJMkRGMzk2MkIyMUM4REM1MDAwODgzNUUzIC8qIFdLSW5rUGlja2VyVmlldy5oICovLAot CQkJCTJERjM5NjJBMjFDOERDNTAwMDg4MzVFMyAvKiBXS0lua1BpY2tlclZpZXcubW0gKi8sCiAJ CQkJMEYzQzcyNTkxOTZGNUY2ODAwQUVERDBDIC8qIFdLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5o ICovLAogCQkJCTBGM0M3MjU3MTk2RjVGNTAwMEFFREQwQyAvKiBXS0luc3BlY3RvckhpZ2hsaWdo dFZpZXcubW0gKi8sCiAJCQkJQTU0MjkzQTIxOTVBNDNDNjAwMjc4MkM3IC8qIFdLSW5zcGVjdG9y Tm9kZVNlYXJjaEdlc3R1cmVSZWNvZ25pemVyLmggKi8sCg==