153982 2016-02-08 05:11:08 -0800 WebVideoFullscreenInterface should handle video resizing. 2017-11-02 11:35:10 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue webkit-bug-importer oldest_to_newest 1162857 0 jeremyj-wk 2016-02-08 05:11:08 -0800 WebVideoFullscreenInterface should handle video resizing. 1162859 1 270852 jeremyj-wk 2016-02-08 05:16:05 -0800 Created attachment 270852 Patch 1162860 2 jeremyj-wk 2016-02-08 05:17:08 -0800 rdar://problem/22031249 1162868 3 270852 eric.carlson 2016-02-08 07:21:19 -0800 Comment on attachment 270852 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270852&action=review > Source/WebCore/ChangeLog:4 > + WebVideoFullscreenInterface should handle video resizing. > + https://bugs.webkit.org/show_bug.cgi?id=153982 Please include the Radar # for posterity. 1162874 4 jeremyj-wk 2016-02-08 07:46:18 -0800 (In reply to comment #3) > Comment on attachment 270852 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270852&action=review > > > Source/WebCore/ChangeLog:4 > > + WebVideoFullscreenInterface should handle video resizing. > > + https://bugs.webkit.org/show_bug.cgi?id=153982 > > Please include the Radar # for posterity. Added radar number. 1162875 5 270855 jeremyj-wk 2016-02-08 07:48:33 -0800 Created attachment 270855 Patch for landing. 1162886 6 270855 commit-queue 2016-02-08 08:46:14 -0800 Comment on attachment 270855 Patch for landing. Clearing flags on attachment: 270855 Committed r196252: <http://trac.webkit.org/changeset/196252> 270852 2016-02-08 05:16:05 -0800 2016-02-08 07:16:37 -0800 Patch bug-153982-20160208051543.patch text/plain 5477 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg1NDUyNjkxNjY5ZWEx MzM2Y2I2ZTllNTBkM2MxNDA4NzUwMGJlMS4uNWRiZWU0MjEyYTA0NWU1ZjFlZDRiOGI0YzkyNDk3 ODVmZThlZGUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAyLTA4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2Ugc2hvdWxkIGhhbmRsZSB2aWRlbyByZXNpemluZy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzk4MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZpZGVvIGZ1bGxzY3JlZW4gY2FuIGJl IGluaXRpYXRlZCBiZWZvcmUgdmlkZW8gZGltZW5zaW9uIGFyZSBhdmFpbGFibGUuCisgICAgICAg IFByb3RlY3QgYWdhaW5zdCBhbiBpbml0aWFsIHdpZHRoIG9yIGhlaWdodCBvZiB6ZXJvIGFuZCBv YnNlcnZlIHJlc2l6ZSBldmVudHMgCisgICAgICAgIHRvIHVwZGF0ZSBvbmNlIHZpZGVvIGRpbWVu c2lvbnMgYmVjb21lIGF2YWlsYWJsZSBvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9j b2NvYS9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5tbToKKyAgICAgICAgKFdl YlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Ojp1cGRhdGVGb3JFdmVudE5hbWUpOgor ICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6Om9ic2VydmVkRXZl bnROYW1lcyk6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBsYXllckxheWVyIGxheW91dFN1YmxheWVy c10pOgorICAgICAgICAoLVtXZWJBVlBsYXllckxheWVyIHZpZGVvUmVjdF0pOgorICAgICAgICAo V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldFZpZGVvRGltZW5zaW9ucyk6CisK IDIwMTYtMDItMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJ bnN0YW5jZSBwcm9wZXJ0eSBnZXR0ZXJzIC8gc2V0dGVycyBjYW5ub3QgYmUgY2FsbGVkIG9uIGFu b3RoZXIgaW5zdGFuY2Ugb2YgdGhlIHNhbWUgdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudC5tbQppbmRleCA1NDgyZTA5NjZhYWQ3MTYyMDA4ZDg3Y2Q5MTVjNTYyMjZlMWE5 YjhkLi5mODlmMTc1ODg2MmVjYzgwZjZjNmQ5MDExNDE1YjRiMDk4YTI1MDA1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9XZWJWaWRl b0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5tbQpAQCAtMTQ3LDYgKzE0NywxMCBAQCB2b2lk IFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Ojp1cGRhdGVGb3JFdmVudE5hbWUo Y29uc3QgV1RGOjpBdG9taWNTdAogICAgICAgICB8fCBldmVudE5hbWUgPT0gZXZlbnROYW1lcygp LmFkZHRyYWNrRXZlbnQKICAgICAgICAgfHwgZXZlbnROYW1lID09IGV2ZW50TmFtZXMoKS5yZW1v dmV0cmFja0V2ZW50KQogICAgICAgICB1cGRhdGVMZWdpYmxlT3B0aW9ucygpOworICAgIAorICAg IGlmIChhbGwKKyAgICAgICAgfHwgZXZlbnROYW1lID09IGV2ZW50TmFtZXMoKS5yZXNpemVFdmVu dCkKKyAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UtPnNldFZpZGVvRGltZW5zaW9u cyh0cnVlLCBtX3ZpZGVvRWxlbWVudC0+dmlkZW9XaWR0aCgpLCBtX3ZpZGVvRWxlbWVudC0+dmlk ZW9IZWlnaHQoKSk7CiAKICAgICBpZiAoYWxsCiAgICAgICAgIHx8IGV2ZW50TmFtZSA9PSBldmVu dE5hbWVzKCkud2Via2l0Y3VycmVudHBsYXliYWNrdGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWRFdmVu dCkgewpAQCAtMzc0LDYgKzM3OCw3IEBAIGNvbnN0IFZlY3RvcjxBdG9taWNTdHJpbmc+JiBXZWJW aWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudDo6b2JzZXJ2ZWRFdmVudE5hCiAgICAgICAg IHNFdmVudE5hbWVzLmdldCgpLmFwcGVuZChldmVudE5hbWVzKCkudGltZXVwZGF0ZUV2ZW50KTsK ICAgICAgICAgc0V2ZW50TmFtZXMuZ2V0KCkuYXBwZW5kKGV2ZW50TmFtZXMoKS5hZGR0cmFja0V2 ZW50KTsKICAgICAgICAgc0V2ZW50TmFtZXMuZ2V0KCkuYXBwZW5kKGV2ZW50TmFtZXMoKS5yZW1v dmV0cmFja0V2ZW50KTsKKyAgICAgICAgc0V2ZW50TmFtZXMuZ2V0KCkuYXBwZW5kKGV2ZW50TmFt ZXMoKS5yZXNpemVFdmVudCk7CiAgICAgICAgIHNFdmVudE5hbWVzLmdldCgpLmFwcGVuZChldmVu dE5hbWVzKCkud2Via2l0Y3VycmVudHBsYXliYWNrdGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWRFdmVu dCk7CiAgICAgfQogICAgIHJldHVybiBzRXZlbnROYW1lcy5nZXQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdC5tbQppbmRleCAxZDY4ZGFkNjI3MGM5ZmI5Zjg3ZmEyMDE0YTM0NWM2OWZiMGM4 YzAwLi5mOTEwMzQ4MzVkNjk3YmJhNmU0YzU5NGFjODBjNjVlMmYzOGI1YWYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC02ODcsNiArNjg3LDkgQEAgc3RhdGljIFdlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNjcmVlblJlYXNvbiBjb252ZXJ0VG9F eGl0RnVsbFMKIAogICAgIFtfdmlkZW9TdWJsYXllciBzZXRQb3NpdGlvbjpDR1BvaW50TWFrZShD R1JlY3RHZXRNaWRYKHNlbGYuYm91bmRzKSwgQ0dSZWN0R2V0TWlkWShzZWxmLmJvdW5kcykpXTsK IAorICAgIGlmIChzZWxmLnZpZGVvRGltZW5zaW9ucy5oZWlnaHQgPD0gMCB8fCBzZWxmLnZpZGVv RGltZW5zaW9ucy53aWR0aCA8PSAwKQorICAgICAgICByZXR1cm47CisKICAgICBGbG9hdFJlY3Qg c291cmNlVmlkZW9GcmFtZTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0VmlkZW9GcmFtZTsKICAgICBm bG9hdCB2aWRlb0FzcGVjdFJhdGlvID0gc2VsZi52aWRlb0RpbWVuc2lvbnMud2lkdGggLyBzZWxm LnZpZGVvRGltZW5zaW9ucy5oZWlnaHQ7CkBAIC03MTEsNyArNzE0LDcgQEAgc3RhdGljIFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNjcmVlblJlYXNvbiBjb252ZXJ0 VG9FeGl0RnVsbFMKICAgICAKICAgICBbTlNPYmplY3QgY2FuY2VsUHJldmlvdXNQZXJmb3JtUmVx dWVzdHNXaXRoVGFyZ2V0OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKHJlc29sdmVCb3VuZHMpIG9i amVjdDpuaWxdOwogICAgIAotICAgIGlmICghQ0dBZmZpbmVUcmFuc2Zvcm1FcXVhbFRvVHJhbnNm b3JtKENHQWZmaW5lVHJhbnNmb3JtSWRlbnRpdHksIHRyYW5zZm9ybSkpCisgICAgaWYgKCFDR0Fm ZmluZVRyYW5zZm9ybUlzSWRlbnRpdHkodHJhbnNmb3JtKSkKICAgICAgICAgW3NlbGYgcGVyZm9y bVNlbGVjdG9yOkBzZWxlY3RvcihyZXNvbHZlQm91bmRzKSB3aXRoT2JqZWN0Om5pbCBhZnRlckRl bGF5OltDQVRyYW5zYWN0aW9uIGFuaW1hdGlvbkR1cmF0aW9uXSArIDAuMV07CiB9CiAKQEAgLTc2 Miw4ICs3NjUsMTEgQEAgc3RhdGljIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpF eGl0RnVsbFNjcmVlblJlYXNvbiBjb252ZXJ0VG9FeGl0RnVsbFMKIAogLSAoQ0dSZWN0KXZpZGVv UmVjdAogewotICAgIGZsb2F0IHZpZGVvQXNwZWN0UmF0aW8gPSBzZWxmLnZpZGVvRGltZW5zaW9u cy53aWR0aCAvIHNlbGYudmlkZW9EaW1lbnNpb25zLmhlaWdodDsKKyAgICBpZiAoc2VsZi52aWRl b0RpbWVuc2lvbnMud2lkdGggPD0gMCB8fCBzZWxmLnZpZGVvRGltZW5zaW9ucy5oZWlnaHQgPD0g MCkKKyAgICAgICAgcmV0dXJuIHNlbGYuYm91bmRzOwogICAgIAorICAgIGZsb2F0IHZpZGVvQXNw ZWN0UmF0aW8gPSBzZWxmLnZpZGVvRGltZW5zaW9ucy53aWR0aCAvIHNlbGYudmlkZW9EaW1lbnNp b25zLmhlaWdodDsKKwogICAgIGlmIChbZ2V0QVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVj dCgpIGlzRXF1YWxUb1N0cmluZzpzZWxmLnZpZGVvR3Jhdml0eV0pCiAgICAgICAgIHJldHVybiBs YXJnZXN0UmVjdFdpdGhBc3BlY3RSYXRpb0luc2lkZVJlY3QodmlkZW9Bc3BlY3RSYXRpbywgc2Vs Zi5ib3VuZHMpOwogICAgIGlmIChbZ2V0QVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdEZp bGwoKSBpc0VxdWFsVG9TdHJpbmc6c2VsZi52aWRlb0dyYXZpdHldKQpAQCAtMTAwMiw2ICsxMDA4 LDEyIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldFZpZGVvRGlt ZW5zaW9ucyhib29sIGhhc1ZpZGVvLCBmbG9hdCB3CiAgICAgW3BsYXllckxheWVyIHNldFZpZGVv RGltZW5zaW9uczpDR1NpemVNYWtlKHdpZHRoLCBoZWlnaHQpXTsKICAgICBbbV9wbGF5ZXJDb250 cm9sbGVyIHNldEhhc0VuYWJsZWRWaWRlbzpoYXNWaWRlb107CiAgICAgW21fcGxheWVyQ29udHJv bGxlciBzZXRDb250ZW50RGltZW5zaW9uczpDR1NpemVNYWtlKHdpZHRoLCBoZWlnaHQpXTsKKyAg ICBbbV9wbGF5ZXJMYXllclZpZXcgc2V0TmVlZHNMYXlvdXRdOworCisgICAgV2ViQVZQaWN0dXJl SW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICpwaXBWaWV3ID0gKFdlYkFWUGljdHVyZUluUGljdHVy ZVBsYXllckxheWVyVmlldyAqKVttX3BsYXllckxheWVyVmlldyBwaWN0dXJlSW5QaWN0dXJlUGxh eWVyTGF5ZXJWaWV3XTsKKyAgICBXZWJBVlBsYXllckxheWVyICpwaXBQbGF5ZXJMYXllciA9IChX ZWJBVlBsYXllckxheWVyICopW3BpcFZpZXcgbGF5ZXJdOworICAgIFtwaXBQbGF5ZXJMYXllciBz ZXRWaWRlb0RpbWVuc2lvbnM6cGxheWVyTGF5ZXIudmlkZW9EaW1lbnNpb25zXTsKKyAgICBbcGlw VmlldyBzZXROZWVkc0xheW91dF07ICAgIAogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0OjpzZXRTZWVrYWJsZVJhbmdlcyhjb25zdCBUaW1lUmFuZ2VzJiB0aW1lUmFu Z2VzKQo= 270855 2016-02-08 07:48:33 -0800 2016-02-08 08:46:14 -0800 Patch for landing. bug-153982-20160208074810.patch text/plain 5892 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg1NDUyNjkxNjY5ZWEx MzM2Y2I2ZTllNTBkM2MxNDA4NzUwMGJlMS4uZDE5ZmE4MGE1ZTcyZmZlYTY5YjQ1YTNmY2E3ZTdh ZjhjYjdlNGQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTAyLTA4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2Ugc2hvdWxkIGhhbmRsZSB2aWRlbyByZXNpemluZy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzk4MgorICAgICAgICByZGFyOi8v cHJvYmxlbS8yMjAzMTI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKwor ICAgICAgICBWaWRlbyBmdWxsc2NyZWVuIGNhbiBiZSBpbml0aWF0ZWQgYmVmb3JlIHZpZGVvIGRp bWVuc2lvbiBhcmUgYXZhaWxhYmxlLgorICAgICAgICBQcm90ZWN0IGFnYWluc3QgYW4gaW5pdGlh bCB3aWR0aCBvciBoZWlnaHQgb2YgemVybyBhbmQgb2JzZXJ2ZSByZXNpemUgZXZlbnRzIAorICAg ICAgICB0byB1cGRhdGUgb25jZSB2aWRlbyBkaW1lbnNpb25zIGJlY29tZSBhdmFpbGFibGUgb3Ig Y2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vY29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWxWaWRlb0VsZW1lbnQubW06CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVv RWxlbWVudDo6dXBkYXRlRm9yRXZlbnROYW1lKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVl bk1vZGVsVmlkZW9FbGVtZW50OjpvYnNlcnZlZEV2ZW50TmFtZXMpOgorICAgICAgICAqIHBsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKC1b V2ViQVZQbGF5ZXJMYXllciBsYXlvdXRTdWJsYXllcnNdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5 ZXJMYXllciB2aWRlb1JlY3RdKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0OjpzZXRWaWRlb0RpbWVuc2lvbnMpOgorCiAyMDE2LTAyLTA1ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgSW5zdGFuY2UgcHJvcGVydHkgZ2V0dGVycyAv IHNldHRlcnMgY2Fubm90IGJlIGNhbGxlZCBvbiBhbm90aGVyIGluc3RhbmNlIG9mIHRoZSBzYW1l IHR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1dlYlZpZGVv RnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0KaW5kZXggNTQ4MmUw OTY2YWFkNzE2MjAwOGQ4N2NkOTE1YzU2MjI2ZTFhOWI4ZC4uZjg5ZjE3NTg4NjJlY2M4MGY2YzZk OTAxMTQxNWI0YjA5OGEyNTAwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1l bnQubW0KQEAgLTE0Nyw2ICsxNDcsMTAgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudDo6dXBkYXRlRm9yRXZlbnROYW1lKGNvbnN0IFdURjo6QXRvbWljU3QKICAgICAg ICAgfHwgZXZlbnROYW1lID09IGV2ZW50TmFtZXMoKS5hZGR0cmFja0V2ZW50CiAgICAgICAgIHx8 IGV2ZW50TmFtZSA9PSBldmVudE5hbWVzKCkucmVtb3ZldHJhY2tFdmVudCkKICAgICAgICAgdXBk YXRlTGVnaWJsZU9wdGlvbnMoKTsKKyAgICAKKyAgICBpZiAoYWxsCisgICAgICAgIHx8IGV2ZW50 TmFtZSA9PSBldmVudE5hbWVzKCkucmVzaXplRXZlbnQpCisgICAgICAgIG1fdmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlLT5zZXRWaWRlb0RpbWVuc2lvbnModHJ1ZSwgbV92aWRlb0VsZW1lbnQtPnZp ZGVvV2lkdGgoKSwgbV92aWRlb0VsZW1lbnQtPnZpZGVvSGVpZ2h0KCkpOwogCiAgICAgaWYgKGFs bAogICAgICAgICB8fCBldmVudE5hbWUgPT0gZXZlbnROYW1lcygpLndlYmtpdGN1cnJlbnRwbGF5 YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZlbnQpIHsKQEAgLTM3NCw2ICszNzgsNyBAQCBj b25zdCBWZWN0b3I8QXRvbWljU3RyaW5nPiYgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0Vs ZW1lbnQ6Om9ic2VydmVkRXZlbnROYQogICAgICAgICBzRXZlbnROYW1lcy5nZXQoKS5hcHBlbmQo ZXZlbnROYW1lcygpLnRpbWV1cGRhdGVFdmVudCk7CiAgICAgICAgIHNFdmVudE5hbWVzLmdldCgp LmFwcGVuZChldmVudE5hbWVzKCkuYWRkdHJhY2tFdmVudCk7CiAgICAgICAgIHNFdmVudE5hbWVz LmdldCgpLmFwcGVuZChldmVudE5hbWVzKCkucmVtb3ZldHJhY2tFdmVudCk7CisgICAgICAgIHNF dmVudE5hbWVzLmdldCgpLmFwcGVuZChldmVudE5hbWVzKCkucmVzaXplRXZlbnQpOwogICAgICAg ICBzRXZlbnROYW1lcy5nZXQoKS5hcHBlbmQoZXZlbnROYW1lcygpLndlYmtpdGN1cnJlbnRwbGF5 YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZlbnQpOwogICAgIH0KICAgICByZXR1cm4gc0V2 ZW50TmFtZXMuZ2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggMWQ2OGRh ZDYyNzBjOWZiOWY4N2ZhMjAxNGEzNDVjNjlmYjBjOGMwMC4uMjY0YWMyZGI0YTViODE3ZGJlMDI2 Y2I2ZmRmZTY1YWIzZjM2Yzg2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAt Njg3LDYgKzY4Nyw5IEBAIHN0YXRpYyBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 RXhpdEZ1bGxTY3JlZW5SZWFzb24gY29udmVydFRvRXhpdEZ1bGxTCiAKICAgICBbX3ZpZGVvU3Vi bGF5ZXIgc2V0UG9zaXRpb246Q0dQb2ludE1ha2UoQ0dSZWN0R2V0TWlkWChzZWxmLmJvdW5kcyks IENHUmVjdEdldE1pZFkoc2VsZi5ib3VuZHMpKV07CiAKKyAgICBpZiAoc2VsZi52aWRlb0RpbWVu c2lvbnMuaGVpZ2h0IDw9IDAgfHwgc2VsZi52aWRlb0RpbWVuc2lvbnMud2lkdGggPD0gMCkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgRmxvYXRSZWN0IHNvdXJjZVZpZGVvRnJhbWU7CiAgICAgRmxv YXRSZWN0IHRhcmdldFZpZGVvRnJhbWU7CiAgICAgZmxvYXQgdmlkZW9Bc3BlY3RSYXRpbyA9IHNl bGYudmlkZW9EaW1lbnNpb25zLndpZHRoIC8gc2VsZi52aWRlb0RpbWVuc2lvbnMuaGVpZ2h0OwpA QCAtNzExLDcgKzcxNCw3IEBAIHN0YXRpYyBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6RXhpdEZ1bGxTY3JlZW5SZWFzb24gY29udmVydFRvRXhpdEZ1bGxTCiAgICAgCiAgICAgW05T T2JqZWN0IGNhbmNlbFByZXZpb3VzUGVyZm9ybVJlcXVlc3RzV2l0aFRhcmdldDpzZWxmIHNlbGVj dG9yOkBzZWxlY3RvcihyZXNvbHZlQm91bmRzKSBvYmplY3Q6bmlsXTsKICAgICAKLSAgICBpZiAo IUNHQWZmaW5lVHJhbnNmb3JtRXF1YWxUb1RyYW5zZm9ybShDR0FmZmluZVRyYW5zZm9ybUlkZW50 aXR5LCB0cmFuc2Zvcm0pKQorICAgIGlmICghQ0dBZmZpbmVUcmFuc2Zvcm1Jc0lkZW50aXR5KHRy YW5zZm9ybSkpCiAgICAgICAgIFtzZWxmIHBlcmZvcm1TZWxlY3RvcjpAc2VsZWN0b3IocmVzb2x2 ZUJvdW5kcykgd2l0aE9iamVjdDpuaWwgYWZ0ZXJEZWxheTpbQ0FUcmFuc2FjdGlvbiBhbmltYXRp b25EdXJhdGlvbl0gKyAwLjFdOwogfQogCkBAIC03NjIsOCArNzY1LDExIEBAIHN0YXRpYyBXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxTY3JlZW5SZWFzb24gY29udmVy dFRvRXhpdEZ1bGxTCiAKIC0gKENHUmVjdCl2aWRlb1JlY3QKIHsKLSAgICBmbG9hdCB2aWRlb0Fz cGVjdFJhdGlvID0gc2VsZi52aWRlb0RpbWVuc2lvbnMud2lkdGggLyBzZWxmLnZpZGVvRGltZW5z aW9ucy5oZWlnaHQ7CisgICAgaWYgKHNlbGYudmlkZW9EaW1lbnNpb25zLndpZHRoIDw9IDAgfHwg c2VsZi52aWRlb0RpbWVuc2lvbnMuaGVpZ2h0IDw9IDApCisgICAgICAgIHJldHVybiBzZWxmLmJv dW5kczsKICAgICAKKyAgICBmbG9hdCB2aWRlb0FzcGVjdFJhdGlvID0gc2VsZi52aWRlb0RpbWVu c2lvbnMud2lkdGggLyBzZWxmLnZpZGVvRGltZW5zaW9ucy5oZWlnaHQ7CisKICAgICBpZiAoW2dl dEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QoKSBpc0VxdWFsVG9TdHJpbmc6c2VsZi52 aWRlb0dyYXZpdHldKQogICAgICAgICByZXR1cm4gbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9J bnNpZGVSZWN0KHZpZGVvQXNwZWN0UmF0aW8sIHNlbGYuYm91bmRzKTsKICAgICBpZiAoW2dldEFW TGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3RGaWxsKCkgaXNFcXVhbFRvU3RyaW5nOnNlbGYu dmlkZW9HcmF2aXR5XSkKQEAgLTk3NSw2ICs5ODEsNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpzZXRDdXJyZW50VGltZShkb3VibGUgY3VycmVudFRpbWUsIGRvdWJs ZQogICAgIE5TVGltZUludGVydmFsIGFuY2hvclRpbWVTdGFtcCA9ICFbbV9wbGF5ZXJDb250cm9s bGVyIHJhdGVdID8gTkFOIDogYW5jaG9yVGltZTsKICAgICBBVlZhbHVlVGltaW5nICp0aW1pbmcg PSBbZ2V0QVZWYWx1ZVRpbWluZ0NsYXNzKCkgdmFsdWVUaW1pbmdXaXRoQW5jaG9yVmFsdWU6Y3Vy cmVudFRpbWUKICAgICAgICAgYW5jaG9yVGltZVN0YW1wOmFuY2hvclRpbWVTdGFtcCByYXRlOjBd OworICAgIAogICAgIFttX3BsYXllckNvbnRyb2xsZXIgc2V0VGltaW5nOnRpbWluZ107CiB9CiAK QEAgLTEwMDIsNiArMTAwOSwxMiBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpzZXRWaWRlb0RpbWVuc2lvbnMoYm9vbCBoYXNWaWRlbywgZmxvYXQgdwogICAgIFtwbGF5 ZXJMYXllciBzZXRWaWRlb0RpbWVuc2lvbnM6Q0dTaXplTWFrZSh3aWR0aCwgaGVpZ2h0KV07CiAg ICAgW21fcGxheWVyQ29udHJvbGxlciBzZXRIYXNFbmFibGVkVmlkZW86aGFzVmlkZW9dOwogICAg IFttX3BsYXllckNvbnRyb2xsZXIgc2V0Q29udGVudERpbWVuc2lvbnM6Q0dTaXplTWFrZSh3aWR0 aCwgaGVpZ2h0KV07CisgICAgW21fcGxheWVyTGF5ZXJWaWV3IHNldE5lZWRzTGF5b3V0XTsKKwor ICAgIFdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqcGlwVmlldyA9IChXZWJB VlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcgKilbbV9wbGF5ZXJMYXllclZpZXcgcGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld107CisgICAgV2ViQVZQbGF5ZXJMYXllciAqcGlw UGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtwaXBWaWV3IGxheWVyXTsKKyAgICBb cGlwUGxheWVyTGF5ZXIgc2V0VmlkZW9EaW1lbnNpb25zOnBsYXllckxheWVyLnZpZGVvRGltZW5z aW9uc107CisgICAgW3BpcFZpZXcgc2V0TmVlZHNMYXlvdXRdOyAgICAKIH0KIAogdm9pZCBXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0U2Vla2FibGVSYW5nZXMoY29uc3QgVGlt ZVJhbmdlcyYgdGltZVJhbmdlcykK