205241 2019-12-14 17:14:48 -0800 Rename "customFixedPositionRect" to "layoutViewportRect" 2019-12-14 18:45:27 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino simon.fraser webkit-bug-importer oldest_to_newest 1598679 0 simon.fraser 2019-12-14 17:14:48 -0800 Rename "customFixedPositionRect" to "layoutViewportRect" 1598680 1 385701 simon.fraser 2019-12-14 17:17:18 -0800 Created attachment 385701 Patch 1598683 2 commit-queue 2019-12-14 18:43:56 -0800 The commit-queue encountered the following flaky tests while processing attachment 385701: imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-1.html bug 205242 (author: cdumez@apple.com) The commit-queue is continuing to process your patch. 1598684 3 385701 commit-queue 2019-12-14 18:44:43 -0800 Comment on attachment 385701 Patch Clearing flags on attachment: 385701 Committed r253531: <https://trac.webkit.org/changeset/253531> 1598685 4 commit-queue 2019-12-14 18:44:44 -0800 All reviewed patches have been landed. Closing bug. 1598686 5 webkit-bug-importer 2019-12-14 18:45:27 -0800 <rdar://problem/57943118> 385701 2019-12-14 17:17:18 -0800 2019-12-14 18:44:43 -0800 Patch bug-205241-20191214171718.patch text/plain 19579 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1NzhjN2I1ZTMzMGMzYzNj MDI3ZTZiNzRmMjMxYWViMzE3Mjk3Y2IuLjYxM2EyMDgwYWIyYWRhNTRlMjE4OTAxYTdhYTQxZDg0 NTg5Y2YzMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTktMTItMTQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lICJjdXN0b21G aXhlZFBvc2l0aW9uUmVjdCIgdG8gImxheW91dFZpZXdwb3J0UmVjdCIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTI0MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdLMiBjb21wdXRlcyB0aGUgcmVjdCB1 c2VkIHRvIGxheW91dCBvdXQgcG9zaXRpb246Zml4ZWQgZWxlbWVudHMgaW4gdGhlIFVJIHByb2Nl c3MuCisgICAgICAgIEZvciBoaXN0b3JpY2FsIHJlYXNvbnMgdGhpcyB3YXMgY2FsbGVkIGN1c3Rv bUZpeGVkUG9zaXRpb25SZWN0LCBidXQgcmVuYW1lIGl0IHRvCisgICAgICAgIGxheW91dFZpZXdw b3J0UmVjdCBzaW5jZSB0aGF0IHdoYXQgaXQgcmVhbGx5IGlzLgorCisgICAgICAgICogU2hhcmVk L1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3BwOgorICAgICAgICAoV2ViS2l0OjpWaXNp YmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0 OjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjpkZWNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpvcGVyYXRvcjw8KToKKyAgICAgICAgKiBTaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl SW5mby5oOgorICAgICAgICAoV2ViS2l0OjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjpW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKToKKyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mbzo6bGF5b3V0Vmlld3BvcnRSZWN0IGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJLaXQ6OlZpc2libGVDb250ZW50UmVj dFVwZGF0ZUluZm86OmN1c3RvbUZpeGVkUG9zaXRpb25SZWN0IGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29y ZGluYXRvclByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdDb29y ZGluYXRvclByb3h5OjpjdXJyZW50TGF5b3V0Vmlld3BvcnQgY29uc3QpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojps YXlvdXRWaWV3cG9ydFJlY3QgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmN1c3RvbUZpeGVkUG9zaXRpb25SZWN0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZGlk VXBkYXRlVmlzaWJsZVJlY3Q6dW5vYnNjdXJlZFJlY3Q6Y29udGVudEluc2V0czp1bm9ic2N1cmVk UmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzOm9ic2N1cmVkSW5zZXRzOnVub2JzY3VyZWRTYWZl QXJlYUluc2V0czppbnB1dFZpZXdCb3VuZHM6c2NhbGU6bWluaW11bVNjYWxlOmluU3RhYmxlU3Rh dGU6aXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTplbmNsb3NlZEluU2Nyb2xs YWJsZUFuY2VzdG9yVmlldzpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlkQ29tbWl0 TGF5ZXJUcmVlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1t OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbXB1dGVMYXlvdXRWaWV3cG9ydFJl Y3QgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnVuY29uc3RyYWluZWRM YXlvdXRWaWV3cG9ydFJlY3QgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmNvbXB1dGVDdXN0b21GaXhlZFBvc2l0aW9uUmVjdCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKToKKwogMjAxOS0xMi0xMyAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgU2NyaXB0 Q29udHJvbGxlcidzIHByb2xpZmVyYXRpb24gb2YgRXhjZXB0aW9uRGV0YWlscyouCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmNw cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3Bw CmluZGV4IDY2ZDgwNzM0MjhlOGNkYTAyNDZmMjVkMjhkNTYyZWQ1ZWY0ZmE4ZTAuLjg3NGU0N2Ji YWQ4N2UwZTllYWFmOWVlOTQyMjU2YWVlMjIxMTQ2ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3BwCkBAIC00MCw3ICs0 MCw3IEBAIHZvaWQgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5jb2RlKElQQzo6RW5j b2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IG1fY29udGVudEluc2V0czsKICAg ICBlbmNvZGVyIDw8IG1fdW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0Jv dW5kczsKICAgICBlbmNvZGVyIDw8IG1fdW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGlu YXRlczsKLSAgICBlbmNvZGVyIDw8IG1fY3VzdG9tRml4ZWRQb3NpdGlvblJlY3Q7CisgICAgZW5j b2RlciA8PCBtX2xheW91dFZpZXdwb3J0UmVjdDsKICAgICBlbmNvZGVyIDw8IG1fb2JzY3VyZWRJ bnNldHM7CiAgICAgZW5jb2RlciA8PCBtX3Vub2JzY3VyZWRTYWZlQXJlYUluc2V0czsKICAgICBl bmNvZGVyIDw8IG1fc2Nyb2xsVmVsb2NpdHk7CkBAIC02NSw3ICs2NSw3IEBAIGJvb2wgVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgVmlz aWJsZUNvbnRlbnRSCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5tX3Vub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMpKQogICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9jdXN0 b21GaXhlZFBvc2l0aW9uUmVjdCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9s YXlvdXRWaWV3cG9ydFJlY3QpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQubV9vYnNjdXJlZEluc2V0cykpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKQEAgLTExMSw3ICsxMTEsNyBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0m IHRzLCBjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiBpbmZvKQogICAgIHRzLmR1 bXBQcm9wZXJ0eSgiY29udGVudEluc2V0cyIsIGluZm8uY29udGVudEluc2V0cygpKTsKICAgICB0 cy5kdW1wUHJvcGVydHkoInVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdC b3VuZHMiLCBpbmZvLnVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3Vu ZHMoKSk7CiAgICAgdHMuZHVtcFByb3BlcnR5KCJ1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nv b3JkaW5hdGVzIiwgaW5mby51bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKCkp OwotICAgIHRzLmR1bXBQcm9wZXJ0eSgiY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QiLCBpbmZvLmN1 c3RvbUZpeGVkUG9zaXRpb25SZWN0KCkpOworICAgIHRzLmR1bXBQcm9wZXJ0eSgibGF5b3V0Vmll d3BvcnRSZWN0IiwgaW5mby5sYXlvdXRWaWV3cG9ydFJlY3QoKSk7CiAgICAgdHMuZHVtcFByb3Bl cnR5KCJvYnNjdXJlZEluc2V0cyIsIGluZm8ub2JzY3VyZWRJbnNldHMoKSk7CiAgICAgdHMuZHVt cFByb3BlcnR5KCJ1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHMiLCBpbmZvLnVub2JzY3VyZWRTYWZl QXJlYUluc2V0cygpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvVmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mby5oCmluZGV4IDBkNzc4OGJmZmFiOWExM2RjMDY3YjJjNjkxMWM4 NGQwY2FhZDNmMjIuLmFjOGRjMmYyYzZlMjFmNDA1NzQ4ZDY5MDZmODRkOTI0NDk2MmMxMWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUlu Zm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJ bmZvLmgKQEAgLTQ3LDEzICs0NywxMyBAQCBjbGFzcyBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJ bmZvIHsKIHB1YmxpYzoKICAgICBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKCkgPSBkZWZh dWx0OwogCi0gICAgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyhjb25zdCBXZWJDb3JlOjpG bG9hdFJlY3QmIGV4cG9zZWRDb250ZW50UmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1 bm9ic2N1cmVkQ29udGVudFJlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0Qm94RXh0ZW50JiBjb250 ZW50SW5zZXRzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3VyZWRSZWN0SW5TY3Jv bGxWaWV3Q29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZENv bnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kcywgY29uc3QgV2ViQ29yZTo6RmxvYXRS ZWN0JiBjdXN0b21GaXhlZFBvc2l0aW9uUmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRCb3hFeHRl bnQmIG9ic2N1cmVkSW5zZXRzLCBjb25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgdW5vYnNj dXJlZFNhZmVBcmVhSW5zZXRzLCBkb3VibGUgc2NhbGUsIGJvb2wgaW5TdGFibGVTdGF0ZSwgYm9v bCBpc0ZpcnN0VXBkYXRlRm9yTmV3Vmlld1NpemUsIGJvb2wgaXNDaGFuZ2luZ09ic2N1cmVkSW5z ZXRzSW50ZXJhY3RpdmVseSwgYm9vbCBhbGxvd1Nocmlua1RvRml0LCBib29sIGVuY2xvc2VkSW5T Y3JvbGxhYmxlQW5jZXN0b3JWaWV3LCBjb25zdCBXZWJDb3JlOjpWZWxvY2l0eURhdGEmIHNjcm9s bFZlbG9jaXR5LCBUcmFuc2FjdGlvbklEIGxhc3RMYXllclRyZWVUcmFuc2FjdGlvbklkKQorICAg IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8oY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBl eHBvc2VkQ29udGVudFJlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZENv bnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgY29udGVudEluc2V0cywg Y29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3Jk aW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdFJl c3BlY3RpbmdJbnB1dFZpZXdCb3VuZHMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgbGF5b3V0 Vmlld3BvcnRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgb2JzY3VyZWRJbnNl dHMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0Qm94RXh0ZW50JiB1bm9ic2N1cmVkU2FmZUFyZWFJbnNl dHMsIGRvdWJsZSBzY2FsZSwgYm9vbCBpblN0YWJsZVN0YXRlLCBib29sIGlzRmlyc3RVcGRhdGVG b3JOZXdWaWV3U2l6ZSwgYm9vbCBpc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5 LCBib29sIGFsbG93U2hyaW5rVG9GaXQsIGJvb2wgZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3Rv clZpZXcsIGNvbnN0IFdlYkNvcmU6OlZlbG9jaXR5RGF0YSYgc2Nyb2xsVmVsb2NpdHksIFRyYW5z YWN0aW9uSUQgbGFzdExheWVyVHJlZVRyYW5zYWN0aW9uSWQpCiAgICAgICAgIDogbV9leHBvc2Vk Q29udGVudFJlY3QoZXhwb3NlZENvbnRlbnRSZWN0KQogICAgICAgICAsIG1fdW5vYnNjdXJlZENv bnRlbnRSZWN0KHVub2JzY3VyZWRDb250ZW50UmVjdCkKICAgICAgICAgLCBtX2NvbnRlbnRJbnNl dHMoY29udGVudEluc2V0cykKICAgICAgICAgLCBtX3Vub2JzY3VyZWRDb250ZW50UmVjdFJlc3Bl Y3RpbmdJbnB1dFZpZXdCb3VuZHModW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0 Vmlld0JvdW5kcykKICAgICAgICAgLCBtX3Vub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRp bmF0ZXModW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGluYXRlcykKLSAgICAgICAgLCBt X2N1c3RvbUZpeGVkUG9zaXRpb25SZWN0KGN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KQorICAgICAg ICAsIG1fbGF5b3V0Vmlld3BvcnRSZWN0KGxheW91dFZpZXdwb3J0UmVjdCkKICAgICAgICAgLCBt X29ic2N1cmVkSW5zZXRzKG9ic2N1cmVkSW5zZXRzKQogICAgICAgICAsIG1fdW5vYnNjdXJlZFNh ZmVBcmVhSW5zZXRzKHVub2JzY3VyZWRTYWZlQXJlYUluc2V0cykKICAgICAgICAgLCBtX3Njcm9s bFZlbG9jaXR5KHNjcm9sbFZlbG9jaXR5KQpAQCAtNzIsNyArNzIsNyBAQCBwdWJsaWM6CiAgICAg Y29uc3QgV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQmIGNvbnRlbnRJbnNldHMoKSBjb25zdCB7IHJl dHVybiBtX2NvbnRlbnRJbnNldHM7IH0KICAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVu b2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMoKSBjb25zdCB7IHJldHVybiBtX3Vu b2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXM7IH0KICAgICBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3Vu ZHMoKSBjb25zdCB7IHJldHVybiBtX3Vub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1 dFZpZXdCb3VuZHM7IH0KLSAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGN1c3RvbUZpeGVk UG9zaXRpb25SZWN0KCkgY29uc3QgeyByZXR1cm4gbV9jdXN0b21GaXhlZFBvc2l0aW9uUmVjdDsg fQorICAgIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgbGF5b3V0Vmlld3BvcnRSZWN0KCkgY29u c3QgeyByZXR1cm4gbV9sYXlvdXRWaWV3cG9ydFJlY3Q7IH0KICAgICBjb25zdCBXZWJDb3JlOjpW ZWxvY2l0eURhdGEmIHNjcm9sbFZlbG9jaXR5KCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxWZWxv Y2l0eTsgfQogICAgIGNvbnN0IFdlYkNvcmU6OkZsb2F0Qm94RXh0ZW50JiBvYnNjdXJlZEluc2V0 cygpIGNvbnN0IHsgcmV0dXJuIG1fb2JzY3VyZWRJbnNldHM7IH0KICAgICBjb25zdCBXZWJDb3Jl OjpGbG9hdEJveEV4dGVudCYgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzKCkgY29uc3QgeyByZXR1 cm4gbV91bm9ic2N1cmVkU2FmZUFyZWFJbnNldHM7IH0KQEAgLTk4LDcgKzk4LDcgQEAgcHJpdmF0 ZToKICAgICBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCBtX2NvbnRlbnRJbnNldHM7CiAgICAgV2Vi Q29yZTo6RmxvYXRSZWN0IG1fdW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmll d0JvdW5kczsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV91bm9ic2N1cmVkUmVjdEluU2Nyb2xs Vmlld0Nvb3JkaW5hdGVzOwotICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX2N1c3RvbUZpeGVkUG9z aXRpb25SZWN0OyAvLyBXaGVuIHZpc3VhbCB2aWV3cG9ydHMgYXJlIGVuYWJsZWQsIHRoaXMgaXMg dGhlIGxheW91dCB2aWV3cG9ydC4KKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9sYXlvdXRWaWV3 cG9ydFJlY3Q7CiAgICAgV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQgbV9vYnNjdXJlZEluc2V0czsK ICAgICBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCBtX3Vub2JzY3VyZWRTYWZlQXJlYUluc2V0czsK ICAgICBXZWJDb3JlOjpWZWxvY2l0eURhdGEgbV9zY3JvbGxWZWxvY2l0eTsKQEAgLTExOSw3ICsx MTksNyBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZUluZm8mIGEsIGNvbnN0IFZpc2libGVDb250ZQogICAgICAgICAmJiBhLnVub2JzY3VyZWRD b250ZW50UmVjdCgpID09IGIudW5vYnNjdXJlZENvbnRlbnRSZWN0KCkKICAgICAgICAgJiYgYS5j b250ZW50SW5zZXRzKCkgPT0gYi5jb250ZW50SW5zZXRzKCkKICAgICAgICAgJiYgYS51bm9ic2N1 cmVkQ29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzKCkgPT0gYi51bm9ic2N1cmVk Q29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzKCkKLSAgICAgICAgJiYgYS5jdXN0 b21GaXhlZFBvc2l0aW9uUmVjdCgpID09IGIuY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QoKQorICAg ICAgICAmJiBhLmxheW91dFZpZXdwb3J0UmVjdCgpID09IGIubGF5b3V0Vmlld3BvcnRSZWN0KCkK ICAgICAgICAgJiYgYS5vYnNjdXJlZEluc2V0cygpID09IGIub2JzY3VyZWRJbnNldHMoKQogICAg ICAgICAmJiBhLnVub2JzY3VyZWRTYWZlQXJlYUluc2V0cygpID09IGIudW5vYnNjdXJlZFNhZmVB cmVhSW5zZXRzKCkKICAgICAgICAgJiYgYS5zY3JvbGxWZWxvY2l0eSgpLmVxdWFsSWdub3JpbmdU aW1lc3RhbXAoYi5zY3JvbGxWZWxvY2l0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclBy b3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9S ZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tCmluZGV4IGI4MTNiZWY1OWRkNmUy YTc4YzU2NmQ0YzhjMjM2NDExZTcyMjk1NDIuLmQxZWNlYWE2ZDM1ZTcyOGVlMTc0ZmM4ZGMwNTI0 NTI0YmYzMmE1ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxh eWVyVHJlZS9pb3MvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eUlPUy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZVNjcm9sbGlu Z0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KQEAgLTExNyw3ICsxMTcsNyBAQCB2b2lkIFJlbW90ZVNj cm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Nyb2xsaW5n U3RhdGVUcmVlJgogRmxvYXRSZWN0IFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmN1 cnJlbnRMYXlvdXRWaWV3cG9ydCgpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IGRvZXMgdGhpcyBn aXZlIGEgZGlmZmVyZW50IHZhbHVlIHRvIHRoZSBsYXN0IHZhbHVlIHB1c2hlZCBvbnRvIHVzPwot ICAgIHJldHVybiBtX3dlYlBhZ2VQcm94eS5jb21wdXRlQ3VzdG9tRml4ZWRQb3NpdGlvblJlY3Qo bV93ZWJQYWdlUHJveHkudW5vYnNjdXJlZENvbnRlbnRSZWN0KCksIG1fd2ViUGFnZVByb3h5LnVu b2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3VuZHMoKSwgbV93ZWJQYWdl UHJveHkuY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QoKSwKKyAgICByZXR1cm4gbV93ZWJQYWdlUHJv eHkuY29tcHV0ZUxheW91dFZpZXdwb3J0UmVjdChtX3dlYlBhZ2VQcm94eS51bm9ic2N1cmVkQ29u dGVudFJlY3QoKSwgbV93ZWJQYWdlUHJveHkudW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGlu Z0lucHV0Vmlld0JvdW5kcygpLCBtX3dlYlBhZ2VQcm94eS5sYXlvdXRWaWV3cG9ydFJlY3QoKSwK ICAgICAgICAgbV93ZWJQYWdlUHJveHkuZGlzcGxheWVkQ29udGVudFNjYWxlKCksIEZyYW1lVmll dzo6TGF5b3V0Vmlld3BvcnRDb25zdHJhaW50OjpVbmNvbnN0cmFpbmVkKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAwMjc0ZDdjZTJmNDM2ODE1NGNjYjY3 OTI1Y2QwZjlkYTQzYzI5Y2Q1Li4wYzZiZDIwMjY0NzJiOTc0OTkwNGRkMzZlMzI2NDhlZGI3YTk2 MzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNjgwLDEyICs2 ODAsMTIgQEAgcHVibGljOgogICAgIGJvb2wgaW5TdGFibGVTdGF0ZSgpIGNvbnN0IHsgcmV0dXJu IG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZS5pblN0YWJsZVN0YXRlKCk7IH0KICAgICBj b25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJ bnB1dFZpZXdCb3VuZHMoKSBjb25zdCB7IHJldHVybiBtX2xhc3RWaXNpYmxlQ29udGVudFJlY3RV cGRhdGUudW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kcygpOyB9 CiAgICAgLy8gV2hlbiB2aXN1YWwgdmlld3BvcnRzIGFyZSBlbmFibGVkLCB0aGlzIGlzIHRoZSBs YXlvdXQgdmlld3BvcnQgcmVjdC4KLSAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGN1c3Rv bUZpeGVkUG9zaXRpb25SZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0VmlzaWJsZUNvbnRlbnRS ZWN0VXBkYXRlLmN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KCk7IH0KKyAgICBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIGxheW91dFZpZXdwb3J0UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFZp c2libGVDb250ZW50UmVjdFVwZGF0ZS5sYXlvdXRWaWV3cG9ydFJlY3QoKTsgfQogCiAgICAgdm9p ZCB1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0 ZUluZm8mKTsKICAgICB2b2lkIHJlc2VuZExhc3RWaXNpYmxlQ29udGVudFJlY3RzKCk7CiAKLSAg ICBXZWJDb3JlOjpGbG9hdFJlY3QgY29tcHV0ZUN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3Vu ZHMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgY3VycmVudEN1c3RvbUZpeGVkUG9zaXRpb25S ZWN0LCBkb3VibGUgZGlzcGxheWVkQ29udGVudFNjYWxlLCBXZWJDb3JlOjpGcmFtZVZpZXc6Okxh eW91dFZpZXdwb3J0Q29uc3RyYWludCA9IFdlYkNvcmU6OkZyYW1lVmlldzo6TGF5b3V0Vmlld3Bv cnRDb25zdHJhaW50OjpVbmNvbnN0cmFpbmVkKSBjb25zdDsKKyAgICBXZWJDb3JlOjpGbG9hdFJl Y3QgY29tcHV0ZUxheW91dFZpZXdwb3J0UmVjdChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVu b2JzY3VyZWRDb250ZW50UmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1bm9ic2N1cmVk Q29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzLCBjb25zdCBXZWJDb3JlOjpGbG9h dFJlY3QmIGN1cnJlbnRMYXlvdXRWaWV3cG9ydFJlY3QsIGRvdWJsZSBkaXNwbGF5ZWRDb250ZW50 U2NhbGUsIFdlYkNvcmU6OkZyYW1lVmlldzo6TGF5b3V0Vmlld3BvcnRDb25zdHJhaW50ID0gV2Vi Q29yZTo6RnJhbWVWaWV3OjpMYXlvdXRWaWV3cG9ydENvbnN0cmFpbnQ6OlVuY29uc3RyYWluZWQp IGNvbnN0OwogCiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHVuY29uc3RyYWluZWRMYXlvdXRWaWV3 cG9ydFJlY3QoKSBjb25zdDsKICAgICB2b2lkIGFkanVzdExheWVyc0ZvckxheW91dFZpZXdwb3J0 KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgbGF5b3V0Vmlld3BvcnQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCBjMDAxYTU5NWFiMWQ2MTE2 YjFlMzIxMTBkZjA0NzcyNDY2MzlhNzI1Li5iMTgxYmRjMTYwMzEyNjNkZDA2OWI5M2ExM2UxYTUx MjdiYmQ1YmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5tbQpAQCAtNDExLDcgKzQxMSw3IEBAIC0gKHZvaWQpZGlkVXBkYXRlVmlzaWJsZVJlY3Q6KENH UmVjdCl2aXNpYmxlQ29udGVudFJlY3QKICAgICB9CiAKICAgICBDR1JlY3QgdW5vYnNjdXJlZENv bnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kcyA9IFtzZWxmIF9jb21wdXRlVW5vYnNj dXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kczp1bm9ic2N1cmVkQ29udGVu dFJlY3QgaW5wdXRWaWV3Qm91bmRzOmlucHV0Vmlld0JvdW5kc107Ci0gICAgV2ViQ29yZTo6Rmxv YXRSZWN0IGZpeGVkUG9zaXRpb25SZWN0Rm9yTGF5b3V0ID0gX3BhZ2UtPmNvbXB1dGVDdXN0b21G aXhlZFBvc2l0aW9uUmVjdCh1bm9ic2N1cmVkQ29udGVudFJlY3QsIHVub2JzY3VyZWRDb250ZW50 UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3VuZHMsIF9wYWdlLT5jdXN0b21GaXhlZFBvc2l0aW9u UmVjdCgpLCB6b29tU2NhbGUsIFdlYkNvcmU6OkZyYW1lVmlldzo6TGF5b3V0Vmlld3BvcnRDb25z dHJhaW50OjpDb25zdHJhaW5lZFRvRG9jdW1lbnRSZWN0KTsKKyAgICBXZWJDb3JlOjpGbG9hdFJl Y3QgZml4ZWRQb3NpdGlvblJlY3RGb3JMYXlvdXQgPSBfcGFnZS0+Y29tcHV0ZUxheW91dFZpZXdw b3J0UmVjdCh1bm9ic2N1cmVkQ29udGVudFJlY3QsIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3Bl Y3RpbmdJbnB1dFZpZXdCb3VuZHMsIF9wYWdlLT5sYXlvdXRWaWV3cG9ydFJlY3QoKSwgem9vbVNj YWxlLCBXZWJDb3JlOjpGcmFtZVZpZXc6OkxheW91dFZpZXdwb3J0Q29uc3RyYWludDo6Q29uc3Ry YWluZWRUb0RvY3VtZW50UmVjdCk7CiAKICAgICBXZWJLaXQ6OlZpc2libGVDb250ZW50UmVjdFVw ZGF0ZUluZm8gdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbygKICAgICAgICAgdmlzaWJsZUNv bnRlbnRSZWN0LApAQCAtNjI4LDggKzYyOCw4IEBAIC0gKHZvaWQpX2RpZENvbW1pdExheWVyVHJl ZTooY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYpbGF5ZXJUcmVlCiAg ICAgfQogICAgIAogICAgIGlmIChib3VuZHNDaGFuZ2VkKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBm YWN0b3IgY29tcHV0ZUN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KCkgaW50byBzb21ldGhpbmcgdGhh dCBnaXZlcyB1cyB0aGlzIHJlY3QuCi0gICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBmaXhlZFBv c2l0aW9uUmVjdCA9IF9wYWdlLT5jb21wdXRlQ3VzdG9tRml4ZWRQb3NpdGlvblJlY3QoX3BhZ2Ut PnVub2JzY3VyZWRDb250ZW50UmVjdCgpLCBfcGFnZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0UmVz cGVjdGluZ0lucHV0Vmlld0JvdW5kcygpLCBfcGFnZS0+Y3VzdG9tRml4ZWRQb3NpdGlvblJlY3Qo KSwgW1tfd2ViVmlldyBzY3JvbGxWaWV3XSB6b29tU2NhbGVdKTsKKyAgICAgICAgLy8gRklYTUU6 IGZhY3RvciBjb21wdXRlTGF5b3V0Vmlld3BvcnRSZWN0KCkgaW50byBzb21ldGhpbmcgdGhhdCBn aXZlcyB1cyB0aGlzIHJlY3QuCisgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBmaXhlZFBvc2l0 aW9uUmVjdCA9IF9wYWdlLT5jb21wdXRlTGF5b3V0Vmlld3BvcnRSZWN0KF9wYWdlLT51bm9ic2N1 cmVkQ29udGVudFJlY3QoKSwgX3BhZ2UtPnVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJ bnB1dFZpZXdCb3VuZHMoKSwgX3BhZ2UtPmxheW91dFZpZXdwb3J0UmVjdCgpLCBbW193ZWJWaWV3 IHNjcm9sbFZpZXddIHpvb21TY2FsZV0pOwogICAgICAgICBbc2VsZiB1cGRhdGVGaXhlZENsaXBw aW5nVmlldzpmaXhlZFBvc2l0aW9uUmVjdF07CiAKICAgICAgICAgLy8gV2UgbmVlZCB0byBwdXNo IHRoZSBuZXcgY29udGVudCBib3VuZHMgdG8gdGhlIHdlYnZpZXcgdG8gdXBkYXRlIGZpeGVkIHBv c2l0aW9uIHJlY3RzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dl YlBhZ2VQcm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJv eHlJT1MubW0KaW5kZXggNTNhNjQ5YmM0YTVhODhmZGZiODlkMTJkMDgyNjlhYTAwY2ZiY2VmOS4u ZTNmZjU1MzNjOTAxNzM5MTFlOWVlMmU2MzQ4MmYzZjk1ZTg3NmY1NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCkBAIC0yNDYsOCArMjQ2LDcg QEAgc3RhdGljIGlubGluZSBmbG9hdCBhZGp1c3RlZFVuZXhwb3NlZE1heEVkZ2UoZmxvYXQgZG9j dW1lbnRFZGdlLCBmbG9hdCBleHBvc2VkUmUKICAgICByZXR1cm4gZXhwb3NlZFJlY3RFZGdlOwog fQogCi0vLyBGSVhNRTogcmVuYW1lIHRoaXMgd2hlbiB2aXN1YWwgdmlld3BvcnRzIGFyZSB0aGUg ZGVmYXVsdC4KLVdlYkNvcmU6OkZsb2F0UmVjdCBXZWJQYWdlUHJveHk6OmNvbXB1dGVDdXN0b21G aXhlZFBvc2l0aW9uUmVjdChjb25zdCBGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdCwg Y29uc3QgRmxvYXRSZWN0JiB1bm9ic2N1cmVkQ29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3 Qm91bmRzLCBjb25zdCBGbG9hdFJlY3QmIGN1cnJlbnRDdXN0b21GaXhlZFBvc2l0aW9uUmVjdCwg ZG91YmxlIGRpc3BsYXllZENvbnRlbnRTY2FsZSwgRnJhbWVWaWV3OjpMYXlvdXRWaWV3cG9ydENv bnN0cmFpbnQgY29uc3RyYWludCkgY29uc3QKK1dlYkNvcmU6OkZsb2F0UmVjdCBXZWJQYWdlUHJv eHk6OmNvbXB1dGVMYXlvdXRWaWV3cG9ydFJlY3QoY29uc3QgRmxvYXRSZWN0JiB1bm9ic2N1cmVk Q29udGVudFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVj dGluZ0lucHV0Vmlld0JvdW5kcywgY29uc3QgRmxvYXRSZWN0JiBjdXJyZW50TGF5b3V0Vmlld3Bv cnRSZWN0LCBkb3VibGUgZGlzcGxheWVkQ29udGVudFNjYWxlLCBGcmFtZVZpZXc6OkxheW91dFZp ZXdwb3J0Q29uc3RyYWludCBjb25zdHJhaW50KSBjb25zdAogewogICAgIEZsb2F0UmVjdCBjb25z dHJhaW5lZFVub2JzY3VyZWRSZWN0ID0gdW5vYnNjdXJlZENvbnRlbnRSZWN0OwogICAgIEZsb2F0 UmVjdCBkb2N1bWVudFJlY3QgPSBwYWdlQ2xpZW50KCkuZG9jdW1lbnRSZWN0KCk7CkBAIC0yNzEs MTYgKzI3MCwxNiBAQCBXZWJDb3JlOjpGbG9hdFJlY3QgV2ViUGFnZVByb3h5Ojpjb21wdXRlQ3Vz dG9tRml4ZWRQb3NpdGlvblJlY3QoY29uc3QgRmxvYXRSZWN0JgogICAgIEZsb2F0UmVjdCB1bm9i c2N1cmVkQ29udGVudFJlY3RGb3JWaWV3cG9ydCA9IGlzQmVsb3dNaW5pbXVtU2NhbGUgPyBjb25z dHJhaW5lZFVub2JzY3VyZWRSZWN0IDogdW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lu cHV0Vmlld0JvdW5kczsKIAogICAgIGF1dG8gbGF5b3V0Vmlld3BvcnRTaXplID0gRnJhbWVWaWV3 OjpleHBhbmRlZExheW91dFZpZXdwb3J0U2l6ZShtX2Jhc2VMYXlvdXRWaWV3cG9ydFNpemUsIExh eW91dFNpemUoZG9jdW1lbnRSZWN0LnNpemUoKSksIG1fcHJlZmVyZW5jZXMtPmxheW91dFZpZXdw b3J0SGVpZ2h0RXhwYW5zaW9uRmFjdG9yKCkpOwotICAgIEZsb2F0UmVjdCBsYXlvdXRWaWV3cG9y dFJlY3QgPSBGcmFtZVZpZXc6OmNvbXB1dGVVcGRhdGVkTGF5b3V0Vmlld3BvcnRSZWN0KExheW91 dFJlY3QoY3VycmVudEN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KSwgTGF5b3V0UmVjdChkb2N1bWVu dFJlY3QpLCBMYXlvdXRTaXplKGNvbnN0cmFpbmVkU2l6ZSksIExheW91dFJlY3QodW5vYnNjdXJl ZENvbnRlbnRSZWN0Rm9yVmlld3BvcnQpLCBsYXlvdXRWaWV3cG9ydFNpemUsIG1fbWluU3RhYmxl TGF5b3V0Vmlld3BvcnRPcmlnaW4sIG1fbWF4U3RhYmxlTGF5b3V0Vmlld3BvcnRPcmlnaW4sIGNv bnN0cmFpbnQpOworICAgIEZsb2F0UmVjdCBsYXlvdXRWaWV3cG9ydFJlY3QgPSBGcmFtZVZpZXc6 OmNvbXB1dGVVcGRhdGVkTGF5b3V0Vmlld3BvcnRSZWN0KExheW91dFJlY3QoY3VycmVudExheW91 dFZpZXdwb3J0UmVjdCksIExheW91dFJlY3QoZG9jdW1lbnRSZWN0KSwgTGF5b3V0U2l6ZShjb25z dHJhaW5lZFNpemUpLCBMYXlvdXRSZWN0KHVub2JzY3VyZWRDb250ZW50UmVjdEZvclZpZXdwb3J0 KSwgbGF5b3V0Vmlld3BvcnRTaXplLCBtX21pblN0YWJsZUxheW91dFZpZXdwb3J0T3JpZ2luLCBt X21heFN0YWJsZUxheW91dFZpZXdwb3J0T3JpZ2luLCBjb25zdHJhaW50KTsKICAgICAKLSAgICBp ZiAobGF5b3V0Vmlld3BvcnRSZWN0ICE9IGN1cnJlbnRDdXN0b21GaXhlZFBvc2l0aW9uUmVjdCkK LSAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICJXZWJQYWdl UHJveHk6OmNvbXB1dGVDdXN0b21GaXhlZFBvc2l0aW9uUmVjdDogbmV3IGxheW91dCB2aWV3cG9y dCAgIiA8PCBsYXlvdXRWaWV3cG9ydFJlY3QpOworICAgIGlmIChsYXlvdXRWaWV3cG9ydFJlY3Qg IT0gY3VycmVudExheW91dFZpZXdwb3J0UmVjdCkKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFZp c2libGVSZWN0cywgc3RyZWFtIDw8ICJXZWJQYWdlUHJveHk6OmNvbXB1dGVMYXlvdXRWaWV3cG9y dFJlY3Q6IG5ldyBsYXlvdXQgdmlld3BvcnQgICIgPDwgbGF5b3V0Vmlld3BvcnRSZWN0KTsKICAg ICByZXR1cm4gbGF5b3V0Vmlld3BvcnRSZWN0OwogfQogCiBGbG9hdFJlY3QgV2ViUGFnZVByb3h5 Ojp1bmNvbnN0cmFpbmVkTGF5b3V0Vmlld3BvcnRSZWN0KCkgY29uc3QKIHsKLSAgICByZXR1cm4g Y29tcHV0ZUN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KHVub2JzY3VyZWRDb250ZW50UmVjdCgpLCB1 bm9ic2N1cmVkQ29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzKCksIGN1c3RvbUZp eGVkUG9zaXRpb25SZWN0KCksIGRpc3BsYXllZENvbnRlbnRTY2FsZSgpLCBGcmFtZVZpZXc6Okxh eW91dFZpZXdwb3J0Q29uc3RyYWludDo6VW5jb25zdHJhaW5lZCk7CisgICAgcmV0dXJuIGNvbXB1 dGVMYXlvdXRWaWV3cG9ydFJlY3QodW5vYnNjdXJlZENvbnRlbnRSZWN0KCksIHVub2JzY3VyZWRD b250ZW50UmVjdFJlc3BlY3RpbmdJbnB1dFZpZXdCb3VuZHMoKSwgbGF5b3V0Vmlld3BvcnRSZWN0 KCksIGRpc3BsYXllZENvbnRlbnRTY2FsZSgpLCBGcmFtZVZpZXc6OkxheW91dFZpZXdwb3J0Q29u c3RyYWludDo6VW5jb25zdHJhaW5lZCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjphZGp1c3RM YXllcnNGb3JMYXlvdXRWaWV3cG9ydChjb25zdCBGbG9hdFJlY3QmIGxheW91dFZpZXdwb3J0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQppbmRleCA5ZGRmNmRmYjJjNWNhNjY3MzFlNTEyM2FlZDkxZDAxNTQ1NmVkZTllLi5iOWU4OGY5 MmJjMGJiMDdkNzVlNGViMGRiYzNiYjNhNWNmMzk2NDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMzcwNiw4ICszNzA2 LDggQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2li bGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIHZpc2kKICAgICAgICAgZWxzZQogICAgICAgICAgICAg ZnJhbWVWaWV3LnNldFZpc3VhbFZpZXdwb3J0T3ZlcnJpZGVSZWN0KFdURjo6bnVsbG9wdCk7CiAK LSAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICJXZWJQYWdl Ojp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzIC0gc2V0TGF5b3V0Vmlld3BvcnRPdmVycmlkZVJl Y3QgIiA8PCB2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmN1c3RvbUZpeGVkUG9zaXRpb25S ZWN0KCkpOwotICAgICAgICBmcmFtZVZpZXcuc2V0TGF5b3V0Vmlld3BvcnRPdmVycmlkZVJlY3Qo TGF5b3V0UmVjdCh2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmN1c3RvbUZpeGVkUG9zaXRp b25SZWN0KCkpKTsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFt IDw8ICJXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzIC0gc2V0TGF5b3V0Vmlld3Bv cnRPdmVycmlkZVJlY3QgIiA8PCB2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmxheW91dFZp ZXdwb3J0UmVjdCgpKTsKKyAgICAgICAgZnJhbWVWaWV3LnNldExheW91dFZpZXdwb3J0T3ZlcnJp ZGVSZWN0KExheW91dFJlY3QodmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5sYXlvdXRWaWV3 cG9ydFJlY3QoKSkpOwogICAgICAgICBpZiAoc2VsZWN0aW9uSXNJbnNpZGVGaXhlZFBvc2l0aW9u Q29udGFpbmVyKGZyYW1lKSkgewogICAgICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIG5leHQg bGF5ZXIgdHJlZSBjb21taXQgY29udGFpbnMgdXAtdG8tZGF0ZSBjYXJldC9zZWxlY3Rpb24gcmVj dHMuCiAgICAgICAgICAgICBmcmFtZVZpZXcuZnJhbWUoKS5zZWxlY3Rpb24oKS5zZXRDYXJldFJl Y3ROZWVkc1VwZGF0ZSgpOwpAQCAtMzczMSw3ICszNzMxLDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRh dGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8m IHZpc2kKICAgICAgICAgICAgIHZpZXdwb3J0U3RhYmlsaXR5ID0gVmlld3BvcnRSZWN0U3RhYmls aXR5OjpVbnN0YWJsZTsKICAgICAgICAgICAgIGxheWVyQWN0aW9uID0gU2Nyb2xsaW5nTGF5ZXJQ b3NpdGlvbkFjdGlvbjo6U2V0QXBwcm94aW1hdGU7CiAgICAgICAgIH0KLSAgICAgICAgc2Nyb2xs aW5nQ29vcmRpbmF0b3ItPnJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKGZyYW1lVmlldywgc2Nyb2xs UG9zaXRpb24sIHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3VzdG9tRml4ZWRQb3NpdGlv blJlY3QoKSwgU2Nyb2xsVHlwZTo6VXNlciwgdmlld3BvcnRTdGFiaWxpdHksIGxheWVyQWN0aW9u KTsKKyAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnJlY29uY2lsZVNjcm9sbGluZ1N0YXRl KGZyYW1lVmlldywgc2Nyb2xsUG9zaXRpb24sIHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8u bGF5b3V0Vmlld3BvcnRSZWN0KCksIFNjcm9sbFR5cGU6OlVzZXIsIHZpZXdwb3J0U3RhYmlsaXR5 LCBsYXllckFjdGlvbik7CiAgICAgfQogfQogCg==