144871 2015-05-11 08:04:26 -0700 Do not exit fullscreen when starting optimized fullscreen since this is done automatically. 2015-06-22 11:18:45 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jonlee webkit-bug-importer oldest_to_newest 1093753 0 jeremyj-wk 2015-05-11 08:04:26 -0700 Do not exit fullscreen when starting optimized fullscreen since this is done automatically. 1093754 1 252860 jeremyj-wk 2015-05-11 08:05:49 -0700 Created attachment 252860 Patch 1093755 2 jeremyj-wk 2015-05-11 08:06:36 -0700 rdar://problem/20719473 1093756 3 jeremyj-wk 2015-05-11 08:07:05 -0700 rdar://problem/20719473 1103169 4 255173 jeremyj-wk 2015-06-18 22:19:45 -0700 Created attachment 255173 Patch 1103324 5 255173 darin 2015-06-19 11:29:02 -0700 Comment on attachment 255173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255173&action=review Is there a way to make a regression test for this? > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:108 > + typedef enum { > + ExitFullScreenReasonDoneButtonTapped, > + ExitFullScreenReasonFullScreenButtonTapped, > + ExitFullScreenReasonPinchGestureHandled, > + ExitFullScreenReasonRemoteControlStopEventReceived, > + ExitFullScreenReasonPictureInPictureStarted > + } ExitFullscreenReason; That’s C style. C++ style would be: enum ExitFullScreenReason { ExitFullScreenReasonDoneButtonTapped ... }; And modern C++ style would be: enum class ExitFullScreenReason { DoneButtonTapped ... }; Please use one of those styles. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:245 > + WebVideoFullscreenInterfaceAVKit::ExitFullscreenReason exitReason; > + switch (reason) { > + case AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped: > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonDoneButtonTapped; > + break; > + case AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped: > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonFullScreenButtonTapped; > + break; > + case AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted: > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonPictureInPictureStarted; > + break; > + case AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled: > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonPinchGestureHandled; > + break; > + case AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived: > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonRemoteControlStopEventReceived; > + break; > + } Seems like we should factor this out into a helper function that makes the AVPlayerViewController codes to the WebVideoFullscreenInterfaceAVKit ones and does nothing else. Build failed on iOS; I think the codes might be different iOS vs. Mac or iOS 8 vs. iOS 9. 1103415 6 255227 jeremyj-wk 2015-06-19 14:44:37 -0700 Created attachment 255227 Patch 1103416 7 jeremyj-wk 2015-06-19 14:46:28 -0700 (In reply to comment #5) > Comment on attachment 255173 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255173&action=review > > Is there a way to make a regression test for this? > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:108 > > + typedef enum { > > + ExitFullScreenReasonDoneButtonTapped, > > + ExitFullScreenReasonFullScreenButtonTapped, > > + ExitFullScreenReasonPinchGestureHandled, > > + ExitFullScreenReasonRemoteControlStopEventReceived, > > + ExitFullScreenReasonPictureInPictureStarted > > + } ExitFullscreenReason; > > That’s C style. C++ style would be: > > enum ExitFullScreenReason { > ExitFullScreenReasonDoneButtonTapped > ... > }; > > And modern C++ style would be: > > enum class ExitFullScreenReason { > DoneButtonTapped > ... > }; > > Please use one of those styles. Updated to Modern C++ style. > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:245 > > + WebVideoFullscreenInterfaceAVKit::ExitFullscreenReason exitReason; > > + switch (reason) { > > + case AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped: > > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonDoneButtonTapped; > > + break; > > + case AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped: > > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonFullScreenButtonTapped; > > + break; > > + case AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted: > > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonPictureInPictureStarted; > > + break; > > + case AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled: > > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonPinchGestureHandled; > > + break; > > + case AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived: > > + exitReason = WebVideoFullscreenInterfaceAVKit::ExitFullScreenReasonRemoteControlStopEventReceived; > > + break; > > + } > > Seems like we should factor this out into a helper function that makes the > AVPlayerViewController codes to the WebVideoFullscreenInterfaceAVKit ones > and does nothing else. Done. > > Build failed on iOS; I think the codes might be different iOS vs. Mac or iOS > 8 vs. iOS 9. Added Missing enums in AVKitSPI.h. 1103422 8 jeremyj-wk 2015-06-19 14:51:16 -0700 Radar updated to: rdar://problem/21467999 1103461 9 255227 darin 2015-06-19 15:59:51 -0700 Comment on attachment 255227 Patch While I am not an expert on this code, it looks good. r=me 1103871 10 255227 commit-queue 2015-06-22 10:42:46 -0700 Comment on attachment 255227 Patch Clearing flags on attachment: 255227 Committed r185834: <http://trac.webkit.org/changeset/185834> 1103872 11 commit-queue 2015-06-22 10:42:49 -0700 All reviewed patches have been landed. Closing bug. 252860 2015-05-11 08:05:49 -0700 2015-06-18 22:19:43 -0700 Patch bug-144871-20150511080427.patch text/plain 2410 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzODgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWViNTM3NzUxYjQ3MDkz NDI5MTE0YWM5ODk5ZDIzODY0YmZiZTNlMC4uOWY0YjZiOWM0NmViYWZmOTQyNzQ5ZDg4ZTg2NTY2 MWY4YmYyZWY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA1LTExICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3QgZXhpdCBmdWxs c2NyZWVuIHdoZW4gc3RhcnRpbmcgb3B0aW1pemVkIGZ1bGxzY3JlZW4gc2luY2UgdGhpcyBpcyBk b25lIGF1dG9tYXRpY2FsbHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3Rh cnRPcHRpbWl6ZWRGdWxsc2NyZWVuKToKKyAgICAgICAgUmVtb3ZlIGV4aXQgZnVsbHNjcmVlbiBj b2RlLgorCiAyMDE1LTA1LTA2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1NdIHJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IGlPUy1vbmx5IG1lZGlh IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCA1MzBmOGMxMTA1NmE0OTM3 NWMzYjZiMmI2NWI5MjgyODExNDBjYTE5Li4wNGE3NjViYjk3MjEyNjVkY2FlZDFhY2I1MTQ3YTk1 OWVjYWE4NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC0xMjQyLDI4ICsx MjQyLDYgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0YXJ0 T3B0aW1pemVkRnVsbHNjcmVlbigpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0YXJ0T3B0aW1pemVkRnVsbHNjcmVlbiglcCki LCB0aGlzKTsKICAgICBzZXRNb2RlKEhUTUxNZWRpYUVsZW1lbnQ6OlZpZGVvRnVsbHNjcmVlbk1v ZGVPcHRpbWl6ZWQpOwotCi0gICAgaWYgKCFoYXNNb2RlKEhUTUxNZWRpYUVsZW1lbnQ6OlZpZGVv RnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJlZlB0cjxX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdD4gc3Ryb25nVGhpcyh0aGlzKTsKLSAgICBm dWxsc2NyZWVuTWF5UmV0dXJuVG9JbmxpbmUoW3N0cm9uZ1RoaXNdKGJvb2wgdmlzaWJsZSkgewot ICAgICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojp3aWxsU3RhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuIC0gbGFtYmRhKCVwKSAtIHZpc2libGUoJXMp Iiwgc3Ryb25nVGhpcy5nZXQoKSwgYm9vbFN0cmluZyh2aXNpYmxlKSk7Ci0KLSAgICAgICAgaWYg KCF2aXNpYmxlKSB7Ci0gICAgICAgICAgICBbc3Ryb25nVGhpcy0+bV93aW5kb3cgc2V0SGlkZGVu OllFU107Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBbW3N0cm9u Z1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwotCi0g ICAgICAgIFtzdHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVu QW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOltzdHJvbmdUaGlzXSAoQk9PTCBjb21wbGV0 ZWQsIE5TRXJyb3IqKSB7Ci0gICAgICAgICAgICBpZiAoIWNvbXBsZXRlZCkKLSAgICAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgICAgICBzdHJvbmdUaGlzLT5jbGVhck1vZGUoSFRNTE1lZGlh RWxlbWVudDo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKTsKLSAgICAgICAgICAgIFtzdHJv bmdUaGlzLT5tX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKLSAgICAgICAgfV07Ci0gICAgfSk7CiB9 CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0YXJ0T3B0aW1p emVkRnVsbHNjcmVlbigpCg== 255173 2015-06-18 22:19:45 -0700 2015-06-19 14:44:34 -0700 Patch bug-144871-20150618221908.patch text/plain 6989 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlMTc4NGMwZWM2YzY0 YmYyZjc3YWM3NjhmZDBlNDkzYzFkYjJmYi4uOTBiZThmZGZlY2E2Y2U1MGViOTA3OGJmMjY3YTk5 MjBiYTRkNzA4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE1LTA2LTE4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAorICAgICAgICBEbyBub3QgZXhpdCBmdWxs c2NyZWVuIHdoZW4gc3RhcnRpbmcgUGlQIHNpbmNlIHRoaXMgaXMgZG9uZSBhdXRvbWF0aWNhbGx5 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0ODcx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ug d2UgZG9uJ3QgZXhwbGljaXRseSBleGl0IGZ1bGxzY3JlZW4sIHVwZGF0ZSBzdGF0ZSBpbiBzaG91 bGRFeGl0RnVsbHNjcmVlbldpdGhSZWFzb24oKQorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6IERlY2xhcmUgc2hvdWxkRXhpdEZ1bGxz Y3JlZW5XaXRoUmVhc29uKCkuCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBsYXllckNvbnRyb2xsZXIg cGxheWVyVmlld0NvbnRyb2xsZXI6c2hvdWxkRXhpdEZ1bGxTY3JlZW5XaXRoUmVhc29uOl0pOiBG b3J3YXJkIHRvIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LgorICAgICAgICAoV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJl YXNvbik6IEFkZGVkLgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6 OndpbGxTdGFydFBpY3R1cmVJblBpY3R1cmUpOiBSZW1vdmUgZW50ZXIgZnVsbHNjcmVlbiBjb2Rl LgorCisyMDE1LTA2LTE4ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKwogICAg ICAgICBEaXNhYmxlIFVJV2luZG93IGZvciBmdWxsc2NyZWVuIHZpZGVvIGZvciBzZWxlY3RlZCBj bGllbnRzLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ1ODUyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKaW5kZXggNmQyMzRjZGU2MjE3N2Jj N2JlNzIyMTM0MzRhNTU0MmMzODg1MjU3MS4uNDJhN2UwZmY5YTU5Y2RkNmQyMzJiOWYzNzY0YjMx YjY1ZGQ2NWU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKQEAgLTk5LDYgKzk5LDE1 IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQgcmVxdWVzdEhpZGVB bmRFeGl0RnVsbHNjcmVlbigpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgdm9pZCBwcmVw YXJlZFRvUmV0dXJuVG9JbmxpbmUoYm9vbCB2aXNpYmxlLCBjb25zdCBJbnRSZWN0JiBpbmxpbmVS ZWN0KTsKIAorICAgIHR5cGVkZWYgZW51bSB7CisgICAgICAgIEV4aXRGdWxsU2NyZWVuUmVhc29u RG9uZUJ1dHRvblRhcHBlZCwKKyAgICAgICAgRXhpdEZ1bGxTY3JlZW5SZWFzb25GdWxsU2NyZWVu QnV0dG9uVGFwcGVkLAorICAgICAgICBFeGl0RnVsbFNjcmVlblJlYXNvblBpbmNoR2VzdHVyZUhh bmRsZWQsCisgICAgICAgIEV4aXRGdWxsU2NyZWVuUmVhc29uUmVtb3RlQ29udHJvbFN0b3BFdmVu dFJlY2VpdmVkLAorICAgICAgICBFeGl0RnVsbFNjcmVlblJlYXNvblBpY3R1cmVJblBpY3R1cmVT dGFydGVkCisgICAgfSBFeGl0RnVsbHNjcmVlblJlYXNvbjsKKworICAgIGJvb2wgc2hvdWxkRXhp dEZ1bGxzY3JlZW5XaXRoUmVhc29uKEV4aXRGdWxsc2NyZWVuUmVhc29uKTsKICAgICBIVE1MTWVk aWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgbW9kZSgpIGNvbnN0IHsgcmV0dXJu IG1fbW9kZTsgfQogICAgIGJvb2wgYWxsb3dzUGljdHVyZUluUGljdHVyZVBsYXliYWNrKCkgY29u c3QgeyByZXR1cm4gbV9hbGxvd3NQaWN0dXJlSW5QaWN0dXJlUGxheWJhY2s7IH0KICAgICBXRUJD T1JFX0VYUE9SVCBib29sIG1heUF1dG9tYXRpY2FsbHlTaG93VmlkZW9QaWN0dXJlSW5QaWN0dXJl KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggNzE4NDJiNDYxMjI4 MmNmMzJkMzlkYjE1OTUzMDFhNmEzZjcwMWFiOS4uMzJjZTM4ODY4Yzc5ZjU1ZGY2Y2Q2NWQ2NWY2 NzAxMDNkMTI1YTg4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtMjI1LDE1 ICsyMjUsMjUgQEAgc3RhdGljIGNvbnN0IGNoYXIqIGJvb2xTdHJpbmcoYm9vbCB2YWwpCiAtIChC T09MKXBsYXllclZpZXdDb250cm9sbGVyOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVy Vmlld0NvbnRyb2xsZXIgc2hvdWxkRXhpdEZ1bGxTY3JlZW5XaXRoUmVhc29uOihBVlBsYXllclZp ZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb24pcmVhc29uCiB7CiAgICAgVU5VU0VEX1BB UkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKLSAgICBVTlVTRURfUEFSQU0ocmVhc29uKTsKLSAg ICBpZiAoIXNlbGYuZGVsZWdhdGUpCi0gICAgICAgIHJldHVybiBZRVM7Ci0gICAgCi0gICAgaWYg KHJlYXNvbiA9PSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb25Eb25l QnV0dG9uVGFwcGVkIHx8IHJlYXNvbiA9PSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxT Y3JlZW5SZWFzb25SZW1vdGVDb250cm9sU3RvcEV2ZW50UmVjZWl2ZWQpCi0gICAgICAgIHNlbGYu ZGVsZWdhdGUtPnBhdXNlKCk7Ci0gICAgCi0gICAgc2VsZi5kZWxlZ2F0ZS0+cmVxdWVzdEV4aXRG dWxsc2NyZWVuKCk7Ci0gICAgcmV0dXJuIE5POworICAgIFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpFeGl0RnVsbHNjcmVlblJlYXNvbiBleGl0UmVhc29uOworICAgIHN3aXRjaCAo cmVhc29uKSB7CisgICAgY2FzZSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5S ZWFzb25Eb25lQnV0dG9uVGFwcGVkOgorICAgICAgICBleGl0UmVhc29uID0gV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQ6OkV4aXRGdWxsU2NyZWVuUmVhc29uRG9uZUJ1dHRvblRhcHBl ZDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1 bGxTY3JlZW5SZWFzb25GdWxsU2NyZWVuQnV0dG9uVGFwcGVkOgorICAgICAgICBleGl0UmVhc29u ID0gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OkV4aXRGdWxsU2NyZWVuUmVhc29u RnVsbFNjcmVlbkJ1dHRvblRhcHBlZDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBVlBsYXll clZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb25QaWN0dXJlSW5QaWN0dXJlU3RhcnRl ZDoKKyAgICAgICAgZXhpdFJlYXNvbiA9IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjpFeGl0RnVsbFNjcmVlblJlYXNvblBpY3R1cmVJblBpY3R1cmVTdGFydGVkOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNv blBpbmNoR2VzdHVyZUhhbmRsZWQ6CisgICAgICAgIGV4aXRSZWFzb24gPSBXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxTY3JlZW5SZWFzb25QaW5jaEdlc3R1cmVIYW5k bGVkOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0 RnVsbFNjcmVlblJlYXNvblJlbW90ZUNvbnRyb2xTdG9wRXZlbnRSZWNlaXZlZDoKKyAgICAgICAg ZXhpdFJlYXNvbiA9IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNj cmVlblJlYXNvblJlbW90ZUNvbnRyb2xTdG9wRXZlbnRSZWNlaXZlZDsKKyAgICAgICAgYnJlYWs7 CisgICAgfQorICAgIHJldHVybiBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPnNob3VsZEV4aXRG dWxsc2NyZWVuV2l0aFJlYXNvbihleGl0UmVhc29uKTsKIH0KIAogLSAodm9pZClwbGF5ZXJWaWV3 Q29udHJvbGxlcjooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVy IHJlc3RvcmVVc2VySW50ZXJmYWNlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKEJPT0wgcmVzdG9yZWQpKWNvbXBsZXRpb25IYW5kbGVyCkBAIC0x MTQzLDMwICsxMTUzLDYgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 d2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZSgpCiB7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZSgl cCkiLCB0aGlzKTsKICAgICBzZXRNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpOwotCi0gICAgaWYgKCFoYXNNb2RlKEhUTUxNZWRp YUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0PiBzdHJv bmdUaGlzKHRoaXMpOwotICAgIGZ1bGxzY3JlZW5NYXlSZXR1cm5Ub0lubGluZShbc3Ryb25nVGhp cywgdGhpc10oYm9vbCB2aXNpYmxlKSB7Ci0gICAgICAgIExPRyhGdWxsc2NyZWVuLCAiV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdGFydFBpY3R1cmVJblBpY3R1cmUgLSBs YW1iZGEoJXApIC0gdmlzaWJsZSglcykiLCB0aGlzLCBib29sU3RyaW5nKHZpc2libGUpKTsKLQot ICAgICAgICBpZiAoIXZpc2libGUpIHsKLSAgICAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRkZW46 WUVTXTsKLSAgICAgICAgICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBzZXRIaWRk ZW46WUVTXTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIFtbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07Ci0KLSAgICAgICAgW21f cGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlv bkhhbmRsZXI6W3N0cm9uZ1RoaXMsIHRoaXNdIChCT09MIGNvbXBsZXRlZCwgTlNFcnJvciopIHsK LSAgICAgICAgICAgIGlmICghY29tcGxldGVkKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVl bk1vZGVTdGFuZGFyZCk7Ci0gICAgICAgICAgICBbbV93aW5kb3cgc2V0SGlkZGVuOllFU107Ci0g ICAgICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0SGlkZGVuOllFU107 Ci0gICAgICAgIH1dOwotICAgIH0pOwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpkaWRTdGFydFBpY3R1cmVJblBpY3R1cmUoKQpAQCAtMTIzOCw2ICsxMjI0LDI0 IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnByZXBhcmVGb3JQaWN0 dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0CiAgICAgfSk7CiB9CiAKK2Jvb2wgV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJlYXNvbihX ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxzY3JlZW5SZWFzb24gcmVh c29uKSAKK3sKKyAgICBpZiAoIW1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCisgICAgICAgIHJldHVy biB0cnVlOworCisgICAgaWYgKHJlYXNvbiA9PSBFeGl0RnVsbFNjcmVlblJlYXNvblBpY3R1cmVJ blBpY3R1cmVTdGFydGVkKSB7CisgICAgICAgIGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50RW51 bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCk7CisgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0KKworICAgIGlmIChyZWFzb24gPT0gRXhpdEZ1bGxTY3JlZW5SZWFzb25Eb25lQnV0dG9u VGFwcGVkIHx8IHJlYXNvbiA9PSBFeGl0RnVsbFNjcmVlblJlYXNvblJlbW90ZUNvbnRyb2xTdG9w RXZlbnRSZWNlaXZlZCkKKyAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbC0+cGF1c2UoKTsK KyAgICAKKyAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5yZXF1ZXN0RXhpdEZ1bGxzY3JlZW4o KTsKKyAgICAKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OnNldE1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxz Y3JlZW5Nb2RlIG1vZGUpCiB7CiAgICAgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxz Y3JlZW5Nb2RlIG5ld01vZGUgPSBtX21vZGUgfCBtb2RlOwo= 255227 2015-06-19 14:44:37 -0700 2015-06-22 10:42:46 -0700 Patch bug-144871-20150619144358.patch text/plain 8389 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlMTc4NGMwZWM2YzY0 YmYyZjc3YWM3NjhmZDBlNDkzYzFkYjJmYi4uM2VmMTliMTQ0NTA1ZmE2ZjMzZTNkNjgyNzIxYTkz YzQ5YmI5M2I1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE1LTA2LTE4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAorICAgICAgICBEbyBub3QgZXhpdCBmdWxs c2NyZWVuIHdoZW4gc3RhcnRpbmcgUGlQIHNpbmNlIHRoaXMgaXMgZG9uZSBhdXRvbWF0aWNhbGx5 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0ODcx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ug d2UgZG9uJ3QgZXhwbGljaXRseSBleGl0IGZ1bGxzY3JlZW4sIHVwZGF0ZSBzdGF0ZSBpbiBzaG91 bGRFeGl0RnVsbHNjcmVlbldpdGhSZWFzb24oKQorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6IERlY2xhcmUgc2hvdWxkRXhpdEZ1bGxz Y3JlZW5XaXRoUmVhc29uKCkuCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBsYXllckNvbnRyb2xsZXIg cGxheWVyVmlld0NvbnRyb2xsZXI6c2hvdWxkRXhpdEZ1bGxTY3JlZW5XaXRoUmVhc29uOl0pOiBG b3J3YXJkIHRvIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LgorICAgICAgICAoV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJl YXNvbik6IEFkZGVkLgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6 OndpbGxTdGFydFBpY3R1cmVJblBpY3R1cmUpOiBSZW1vdmUgZW50ZXIgZnVsbHNjcmVlbiBjb2Rl LgorICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oOiBBZGQgbWlzc2luZyBl bnVtcy4KKworMjAxNS0wNi0xOCAgSmVyZW15IEpvbmVzICA8amVyZW15akBhcHBsZS5jb20+CisK ICAgICAgICAgRGlzYWJsZSBVSVdpbmRvdyBmb3IgZnVsbHNjcmVlbiB2aWRlbyBmb3Igc2VsZWN0 ZWQgY2xpZW50cy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NTg1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCmluZGV4IDZkMjM0Y2RlNjIx NzdiYzdiZTcyMjEzNDM0YTU1NDJjMzg4NTI1NzEuLjllN2RmNmY3N2IwYTMwZjZiYWZmZTRmN2Q0 ZjA1NWYyN2UxOTRjNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCkBAIC05OSw2ICs5 OSwxNSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIHJlcXVlc3RI aWRlQW5kRXhpdEZ1bGxzY3JlZW4oKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQg cHJlcGFyZWRUb1JldHVyblRvSW5saW5lKGJvb2wgdmlzaWJsZSwgY29uc3QgSW50UmVjdCYgaW5s aW5lUmVjdCk7CiAKKyAgICBlbnVtIGNsYXNzIEV4aXRGdWxsU2NyZWVuUmVhc29uIHsKKyAgICAg ICAgRG9uZUJ1dHRvblRhcHBlZCwKKyAgICAgICAgRnVsbFNjcmVlbkJ1dHRvblRhcHBlZCwKKyAg ICAgICAgUGluY2hHZXN0dXJlSGFuZGxlZCwKKyAgICAgICAgUmVtb3RlQ29udHJvbFN0b3BFdmVu dFJlY2VpdmVkLAorICAgICAgICBQaWN0dXJlSW5QaWN0dXJlU3RhcnRlZAorICAgIH07CisKKyAg ICBib29sIHNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJlYXNvbihFeGl0RnVsbFNjcmVlblJlYXNv bik7CiAgICAgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUo KSBjb25zdCB7IHJldHVybiBtX21vZGU7IH0KICAgICBib29sIGFsbG93c1BpY3R1cmVJblBpY3R1 cmVQbGF5YmFjaygpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dzUGljdHVyZUluUGljdHVyZVBsYXli YWNrOyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBtYXlBdXRvbWF0aWNhbGx5U2hvd1ZpZGVv UGljdHVyZUluUGljdHVyZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmlu ZGV4IDcxODQyYjQ2MTIyODJjZjMyZDM5ZGIxNTk1MzAxYTZhM2Y3MDFhYjkuLjBhNDUwNGNkMTll NWVkMDNmODUxMzAzOTY1Y2Y3ZDg0MzBiOWQ0MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQubW0KQEAgLTIyMiwxOCArMjIyLDI2IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBib29sU3RyaW5n KGJvb2wgdmFsKQogICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ZGlkU3RvcFBpY3R1cmVJ blBpY3R1cmUoKTsKIH0KIAorc3RhdGljIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjpFeGl0RnVsbFNjcmVlblJlYXNvbiBjb252ZXJ0VG9FeGl0RnVsbFNjcmVlblJlYXNvbihBVlBs YXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb24gcmVhc29uKQoreworICAgIHN3 aXRjaCAocmVhc29uKSB7CisgICAgY2FzZSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxT Y3JlZW5SZWFzb25Eb25lQnV0dG9uVGFwcGVkOgorICAgICAgICByZXR1cm4gV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQ6OkV4aXRGdWxsU2NyZWVuUmVhc29uOjpEb25lQnV0dG9uVGFw cGVkOworICAgIGNhc2UgQVZQbGF5ZXJWaWV3Q29udHJvbGxlckV4aXRGdWxsU2NyZWVuUmVhc29u RnVsbFNjcmVlbkJ1dHRvblRhcHBlZDoKKyAgICAgICAgcmV0dXJuIFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNjcmVlblJlYXNvbjo6RnVsbFNjcmVlbkJ1dHRvblRh cHBlZDsKKyAgICBjYXNlIEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNv blBpY3R1cmVJblBpY3R1cmVTdGFydGVkOgorICAgICAgICByZXR1cm4gV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OkV4aXRGdWxsU2NyZWVuUmVhc29uOjpQaWN0dXJlSW5QaWN0dXJl U3RhcnRlZDsKKyAgICBjYXNlIEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJl YXNvblBpbmNoR2VzdHVyZUhhbmRsZWQ6CisgICAgICAgIHJldHVybiBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxTY3JlZW5SZWFzb246OlBpbmNoR2VzdHVyZUhhbmRs ZWQ7CisgICAgY2FzZSBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb25S ZW1vdGVDb250cm9sU3RvcEV2ZW50UmVjZWl2ZWQ6CisgICAgICAgIHJldHVybiBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxTY3JlZW5SZWFzb246OlJlbW90ZUNvbnRy b2xTdG9wRXZlbnRSZWNlaXZlZDsKKyAgICB9Cit9CisKIC0gKEJPT0wpcGxheWVyVmlld0NvbnRy b2xsZXI6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlciBzaG91 bGRFeGl0RnVsbFNjcmVlbldpdGhSZWFzb246KEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVs bFNjcmVlblJlYXNvbilyZWFzb24KIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVyVmlld0NvbnRy b2xsZXIpOwotICAgIFVOVVNFRF9QQVJBTShyZWFzb24pOwotICAgIGlmICghc2VsZi5kZWxlZ2F0 ZSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAKLSAgICBpZiAocmVhc29uID09IEFWUGxheWVy Vmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNvbkRvbmVCdXR0b25UYXBwZWQgfHwgcmVh c29uID09IEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNvblJlbW90ZUNv bnRyb2xTdG9wRXZlbnRSZWNlaXZlZCkKLSAgICAgICAgc2VsZi5kZWxlZ2F0ZS0+cGF1c2UoKTsK LSAgICAKLSAgICBzZWxmLmRlbGVnYXRlLT5yZXF1ZXN0RXhpdEZ1bGxzY3JlZW4oKTsKLSAgICBy ZXR1cm4gTk87CisgICAgcmV0dXJuIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+c2hvdWxkRXhp dEZ1bGxzY3JlZW5XaXRoUmVhc29uKGNvbnZlcnRUb0V4aXRGdWxsU2NyZWVuUmVhc29uKHJlYXNv bikpOwogfQogCiAtICh2b2lkKXBsYXllclZpZXdDb250cm9sbGVyOihBVlBsYXllclZpZXdDb250 cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIgcmVzdG9yZVVzZXJJbnRlcmZhY2VGb3JQaWN0 dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQk9PTCByZXN0 b3JlZCkpY29tcGxldGlvbkhhbmRsZXIKQEAgLTExNDMsMzAgKzExNTEsNiBAQCB2b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCkK IHsKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojp3aWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCVwKSIsIHRoaXMpOwogICAgIHNldE1vZGUoSFRN TE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSk7 Ci0KLSAgICBpZiAoIWhhc01vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3Jl ZW5Nb2RlU3RhbmRhcmQpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBSZWZQdHI8V2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ+IHN0cm9uZ1RoaXModGhpcyk7Ci0gICAgZnVsbHNjcmVl bk1heVJldHVyblRvSW5saW5lKFtzdHJvbmdUaGlzLCB0aGlzXShib29sIHZpc2libGUpIHsKLSAg ICAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 d2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZSAtIGxhbWJkYSglcCkgLSB2aXNpYmxlKCVzKSIsIHRo aXMsIGJvb2xTdHJpbmcodmlzaWJsZSkpOwotCi0gICAgICAgIGlmICghdmlzaWJsZSkgewotICAg ICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOwotICAgICAgICAgICAgW1ttX3BsYXll clZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNdOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0KLSAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIGxh eW91dElmTmVlZGVkXTsKLQotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVs bFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpbc3Ryb25nVGhpcywgdGhpc10g KEJPT0wgY29tcGxldGVkLCBOU0Vycm9yKikgewotICAgICAgICAgICAgaWYgKCFjb21wbGV0ZWQp Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgY2xlYXJNb2RlKEhUTUxNZWRp YUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKTsKLSAgICAgICAgICAg IFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKLSAgICAgICAgICAgIFtbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciB2aWV3XSBzZXRIaWRkZW46WUVTXTsKLSAgICAgICAgfV07Ci0gICAgfSk7CiB9CiAK IHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0YXJ0UGljdHVyZUlu UGljdHVyZSgpCkBAIC0xMjM4LDYgKzEyMjIsMjQgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6cHJlcGFyZUZvclBpY3R1cmVJblBpY3R1cmVTdG9wV2l0aENvbXBsZXQK ICAgICB9KTsKIH0KIAorYm9vbCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2hv dWxkRXhpdEZ1bGxzY3JlZW5XaXRoUmVhc29uKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpFeGl0RnVsbFNjcmVlblJlYXNvbiByZWFzb24pCit7CisgICAgaWYgKCFtX3ZpZGVvRnVs bHNjcmVlbk1vZGVsKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGlmIChyZWFzb24gPT0g RXhpdEZ1bGxTY3JlZW5SZWFzb246OlBpY3R1cmVJblBpY3R1cmVTdGFydGVkKSB7CisgICAgICAg IGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFu ZGFyZCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmIChyZWFzb24gPT0g RXhpdEZ1bGxTY3JlZW5SZWFzb246OkRvbmVCdXR0b25UYXBwZWQgfHwgcmVhc29uID09IEV4aXRG dWxsU2NyZWVuUmVhc29uOjpSZW1vdGVDb250cm9sU3RvcEV2ZW50UmVjZWl2ZWQpCisgICAgICAg IG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwtPnBhdXNlKCk7CisgICAgCisgICAgbV92aWRlb0Z1bGxz Y3JlZW5Nb2RlbC0+cmVxdWVzdEV4aXRGdWxsc2NyZWVuKCk7CisgICAgCisgICAgcmV0dXJuIGZh bHNlOworfQorCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRNb2Rl KEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSBtb2RlKQogewogICAg IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSBuZXdNb2RlID0gbV9t b2RlIHwgbW9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJ LmgKaW5kZXggY2FiZDUwOWQ3YTI3ZDM1ZDlmZTdlOGNiNjNiYWM5YTNlMGFmYmQ5MS4uN2NiYjA3 YjY2M2RkZjEzNDE0MTdlZmJmZDU0Y2IwMzAzZmE2NGRlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKQEAgLTc0LDggKzc0LDExIEBAIHR5cGVkZWYg TlNfRU5VTShOU0ludGVnZXIsIEFWVmlkZW9MYXllckdyYXZpdHkpIHsKIEBwcm90b2NvbCBBVlBs YXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgPE5TT2JqZWN0PgogQG9wdGlvbmFsCiB0eXBlZGVm IE5TX0VOVU0oTlNJbnRlZ2VyLCBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5S ZWFzb24pIHsKLSAgICBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb25E b25lQnV0dG9uVGFwcGVkID0gMCwKLSAgICBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxT Y3JlZW5SZWFzb25SZW1vdGVDb250cm9sU3RvcEV2ZW50UmVjZWl2ZWQgPSAzLAorICAgIEFWUGxh eWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNvbkRvbmVCdXR0b25UYXBwZWQsCisg ICAgQVZQbGF5ZXJWaWV3Q29udHJvbGxlckV4aXRGdWxsU2NyZWVuUmVhc29uRnVsbFNjcmVlbkJ1 dHRvblRhcHBlZCwKKyAgICBBVlBsYXllclZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFz b25QaW5jaEdlc3R1cmVIYW5kbGVkLAorICAgIEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVs bFNjcmVlblJlYXNvblJlbW90ZUNvbnRyb2xTdG9wRXZlbnRSZWNlaXZlZCwKKyAgICBBVlBsYXll clZpZXdDb250cm9sbGVyRXhpdEZ1bGxTY3JlZW5SZWFzb25QaWN0dXJlSW5QaWN0dXJlU3RhcnRl ZAogfTsKIC0gKEJPT0wpcGxheWVyVmlld0NvbnRyb2xsZXI6KEFWUGxheWVyVmlld0NvbnRyb2xs ZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlciBzaG91bGRFeGl0RnVsbFNjcmVlbldpdGhSZWFzb246 KEFWUGxheWVyVmlld0NvbnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNvbilyZWFzb247CiAtICh2 b2lkKXBsYXllclZpZXdDb250cm9sbGVyOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVy Vmlld0NvbnRyb2xsZXIgcmVzdG9yZVVzZXJJbnRlcmZhY2VGb3JQaWN0dXJlSW5QaWN0dXJlU3Rv cFdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQk9PTCByZXN0b3JlZCkpY29tcGxldGlv bkhhbmRsZXI7Cg==