128558 2014-02-10 15:36:07 -0800 WK2 AVKit enter fullscreen doesn't work a second time. 2014-02-15 00:20:23 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson glenn jer.noble philipj sergio oldest_to_newest 979094 0 jeremyj-wk 2014-02-10 15:36:07 -0800 WebVideoFullscreenInterfaceAVKit's m_playerController get's cleared on exitfullscreen() and never recreated. 979101 1 223757 jeremyj-wk 2014-02-10 15:43:18 -0800 Created attachment 223757 Patch 979104 2 223757 jer.noble 2014-02-10 15:48:26 -0800 Comment on attachment 223757 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223757&action=review > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:57 > + WebAVPlayerController *getPlayerController(); This should just be "playerController()", or perhaps "ensurePlayerController()" due to the lazy-creation. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:225 > + if (m_videoFullscreenModel) > + m_playerController.get().delegate = m_videoFullscreenModel; shouldn't this be in the "if (!m_playerController)" case? 979105 3 jeremyj-wk 2014-02-10 15:49:25 -0800 (In reply to comment #2) > (From update of attachment 223757 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223757&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:57 > > + WebAVPlayerController *getPlayerController(); > > This should just be "playerController()", or perhaps "ensurePlayerController()" due to the lazy-creation. > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:225 > > + if (m_videoFullscreenModel) > > + m_playerController.get().delegate = m_videoFullscreenModel; > > shouldn't this be in the "if (!m_playerController)" case? Good point. I'll fix that. 979110 4 223759 jeremyj-wk 2014-02-10 15:52:01 -0800 Created attachment 223759 Patch 979111 5 jeremyj-wk 2014-02-10 15:53:55 -0800 (In reply to comment #2) > (From update of attachment 223757 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223757&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:57 > > + WebAVPlayerController *getPlayerController(); > > This should just be "playerController()", or perhaps "ensurePlayerController()" due to the lazy-creation. I thought style guidelines require getters to begin with "get". 979112 6 jeremyj-wk 2014-02-10 15:55:00 -0800 (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 223757 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=223757&action=review > > > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h:57 > > > + WebAVPlayerController *getPlayerController(); > > > > This should just be "playerController()", or perhaps "ensurePlayerController()" due to the lazy-creation. > > I thought style guidelines require getters to begin with "get". Sorry, I'm wrong. I actually originally had playerController(). I'll switch back to that. 979115 7 223761 jeremyj-wk 2014-02-10 16:05:21 -0800 Created attachment 223761 Patch 979117 8 223761 jer.noble 2014-02-10 16:09:01 -0800 Comment on attachment 223761 Patch r=me. 981123 9 223761 commit-queue 2014-02-15 00:20:21 -0800 Comment on attachment 223761 Patch Clearing flags on attachment: 223761 Committed r164161: <http://trac.webkit.org/changeset/164161> 981124 10 commit-queue 2014-02-15 00:20:23 -0800 All reviewed patches have been landed. Closing bug. 223757 2014-02-10 15:43:18 -0800 2014-02-10 15:51:59 -0800 Patch bug-128558-20140210154318.patch text/plain 6629 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBmMWJmMjMxZTFkMTdm NzczNTA1ZGEyNTg0MzYzOGI5NWMxMzFjMS4uODVlMDU4YzFjYTg5ZDIwZjUzY2E3YTliZmRhNjcw N2U1MmM1Nzk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTEwICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBXSzIgQVZLaXQgZW50ZXIg ZnVsbHNjcmVlbiBkb2Vzbid0IHdvcmsgYSBzZWNvbmQgdGltZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODU1OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhemlseSBjcmVhdGUgV2ViQVZQbGF5ZXJD b250cm9sbGVyIHdoZW4gbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0KToKKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpnZXRQbGF5ZXJDb250cm9s bGVyKToKKyAgICAgICAgQWRkIGdldFBsYXllckNvbnRyb2xsZXIoKQorCisgICAgICAgIChXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwp OgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldER1cmF0aW9u KToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRDdXJyZW50 VGltZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0UmF0 ZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0VmlkZW9E aW1lbnNpb25zKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojpz ZXRWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjplbnRlckZ1bGxzY3JlZW5XaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICB1c2UgZ2V0 UGxheWVyQ29udHJvbGxlcigpOworCiAyMDE0LTAyLTEwICBSb2dlciBGb25nICA8cm9nZXJfZm9u Z0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbmRvd3NdIFVucmV2aWV3ZWQgdGVzdCBmaXguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCmluZGV4IDZiOGI4YzY3Y2RjYjUyZTdiZGFmYTE2OWVh MTU2MGFmMzRlZjY2MmEuLmU5ZjZhNTAxZTFiYzBiNGVmNmM0YjhhYjg0MjFjNWUxYjQ1YWQyNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCkBAIC01Myw2ICs1Myw4IEBAIGNsYXNzIFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0CiAgICAgUmV0YWluUHRyPFVJVmlld0NvbnRy b2xsZXI+IG1fdmlld0NvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFVJV2luZG93PiBtX3dpbmRv dzsKICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCogbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbDsK KyAgICAgICAgCisgICAgV2ViQVZQbGF5ZXJDb250cm9sbGVyICpnZXRQbGF5ZXJDb250cm9sbGVy KCk7CiAgICAgCiBwdWJsaWM6CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCAyYmZhNTdkOTMxOWYwYThmODJi MjUwNDBiZTg5NThhYzQ5YzcxOGVjLi4yZmJhNjY3OGM3YTk5YWJkM2JjYzc4NzBlNTg3ZjAxMDJl NmU5OTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC0yMTQsMTkgKzIxNCwy OSBAQCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6V2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQoKQogICAgIGluaXRBVlZhbHVlVGltaW5nKCk7CiAgICAgaW5pdFVJVmll d0NvbnRyb2xsZXIoKTsKICAgICBpbml0QVZQbGF5ZXJMYXllcigpOworfQorCitXZWJBVlBsYXll ckNvbnRyb2xsZXIgKldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpnZXRQbGF5ZXJD b250cm9sbGVyKCkKK3sKKyAgICBpZiAoIW1fcGxheWVyQ29udHJvbGxlcikKKyAgICAgICAgbV9w bGF5ZXJDb250cm9sbGVyID0gYWRvcHROUyhbW1dlYkFWUGxheWVyQ29udHJvbGxlciBhbGxvY10g aW5pdF0pOwogICAgIAotICAgIG1fcGxheWVyQ29udHJvbGxlciA9IGFkb3B0TlMoW1tXZWJBVlBs YXllckNvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5N b2RlbCkKKyAgICAgICAgbV9wbGF5ZXJDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gbV92aWRl b0Z1bGxzY3JlZW5Nb2RlbDsKKworICAgIHJldHVybiBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCk7 CiB9CiAKKwogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0V2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWwoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwqIG1vZGVsKQogewogICAg IG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwgPSBtb2RlbDsKLSAgICBtX3BsYXllckNvbnRyb2xsZXIu Z2V0KCkuZGVsZWdhdGUgPSBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsOworICAgIGdldFBsYXllckNv bnRyb2xsZXIoKS5kZWxlZ2F0ZSA9IG1fdmlkZW9GdWxsc2NyZWVuTW9kZWw7CiB9CiAKIHZvaWQg V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldER1cmF0aW9uKGRvdWJsZSBkdXJh dGlvbikKIHsKLSAgICBXZWJBVlBsYXllckNvbnRyb2xsZXIqIHBsYXllckNvbnRyb2xsZXIgPSBt X3BsYXllckNvbnRyb2xsZXIuZ2V0KCk7CisgICAgV2ViQVZQbGF5ZXJDb250cm9sbGVyKiBwbGF5 ZXJDb250cm9sbGVyID0gZ2V0UGxheWVyQ29udHJvbGxlcigpOwogICAgIAogICAgIC8vIEZJWE1F OiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MDE3IHVzZSBjb3Jy ZWN0IHZhbHVlcyBpbnN0ZWFkIG9mIGR1cmF0aW9uIGZvciBhbGwgdGhlc2UKICAgICBwbGF5ZXJD b250cm9sbGVyLmNvbnRlbnREdXJhdGlvbiA9IGR1cmF0aW9uOwpAQCAtMjQ2LDMxICsyNTYsMzEg QEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0RHVyYXRpb24oZG91 YmxlIGR1cmF0aW9uKQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojpz ZXRDdXJyZW50VGltZShkb3VibGUgY3VycmVudFRpbWUsIGRvdWJsZSBhbmNob3JUaW1lKQogewot ICAgIE5TVGltZUludGVydmFsIGFuY2hvclRpbWVTdGFtcCA9ICFbbV9wbGF5ZXJDb250cm9sbGVy IHJhdGVdID8gTkFOIDogYW5jaG9yVGltZTsKKyAgICBOU1RpbWVJbnRlcnZhbCBhbmNob3JUaW1l U3RhbXAgPSAhW2dldFBsYXllckNvbnRyb2xsZXIoKSByYXRlXSA/IE5BTiA6IGFuY2hvclRpbWU7 CiAgICAgQVZWYWx1ZVRpbWluZyAqdGltaW5nID0gW2NsYXNzQVZWYWx1ZVRpbWluZyB2YWx1ZVRp bWluZ1dpdGhBbmNob3JWYWx1ZTpjdXJyZW50VGltZQogICAgICAgICBhbmNob3JUaW1lU3RhbXA6 YW5jaG9yVGltZVN0YW1wIHJhdGU6MF07Ci0gICAgbV9wbGF5ZXJDb250cm9sbGVyLmdldCgpLnRp bWluZyA9IHRpbWluZzsKKyAgICBnZXRQbGF5ZXJDb250cm9sbGVyKCkudGltaW5nID0gdGltaW5n OwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRSYXRlKGJv b2wgaXNQbGF5aW5nLCBmbG9hdCBwbGF5YmFja1JhdGUpCiB7Ci0gICAgbV9wbGF5ZXJDb250cm9s bGVyLmdldCgpLnJhdGUgPSBpc1BsYXlpbmcgPyBwbGF5YmFja1JhdGUgOiAwLjsKKyAgICBnZXRQ bGF5ZXJDb250cm9sbGVyKCkucmF0ZSA9IGlzUGxheWluZyA/IHBsYXliYWNrUmF0ZSA6IDAuOwog fQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRWaWRlb0RpbWVu c2lvbnMoYm9vbCBoYXNWaWRlbywgZmxvYXQgd2lkdGgsIGZsb2F0IGhlaWdodCkKIHsKLSAgICBt X3BsYXllckNvbnRyb2xsZXIuZ2V0KCkuaGFzRW5hYmxlZFZpZGVvID0gaGFzVmlkZW87Ci0gICAg bV9wbGF5ZXJDb250cm9sbGVyLmdldCgpLmNvbnRlbnREaW1lbnNpb25zID0gQ0dTaXplTWFrZSh3 aWR0aCwgaGVpZ2h0KTsKKyAgICBnZXRQbGF5ZXJDb250cm9sbGVyKCkuaGFzRW5hYmxlZFZpZGVv ID0gaGFzVmlkZW87CisgICAgZ2V0UGxheWVyQ29udHJvbGxlcigpLmNvbnRlbnREaW1lbnNpb25z ID0gQ0dTaXplTWFrZSh3aWR0aCwgaGVpZ2h0KTsKIH0KIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdDo6c2V0VmlkZW9MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVy KQogewotICAgIFttX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkucGxheWVyTGF5ZXIgcmVtb3ZlRnJv bVN1cGVybGF5ZXJdOworICAgIFtnZXRQbGF5ZXJDb250cm9sbGVyKCkucGxheWVyTGF5ZXIgcmVt b3ZlRnJvbVN1cGVybGF5ZXJdOwogICAgIFt2aWRlb0xheWVyIHJlbW92ZUZyb21TdXBlcmxheWVy XTsKICAgICBBU1NFUlQoIXZpZGVvTGF5ZXIKICAgICAgICAgfHwgW3ZpZGVvTGF5ZXIgaXNLaW5k T2ZDbGFzczpbY2xhc3NBVlBsYXllckxheWVyIGNsYXNzXV0KICAgICAgICAgfHwgKFt2aWRlb0xh eWVyIGlzS2luZE9mQ2xhc3M6W0NBTGF5ZXIgY2xhc3NdXSAmJiBbdmlkZW9MYXllciBjb25mb3Jt c1RvUHJvdG9jb2w6QHByb3RvY29sKEFWUGxheWVyTGF5ZXIpXSkpOwotICAgIG1fcGxheWVyQ29u dHJvbGxlci5nZXQoKS5wbGF5ZXJMYXllciA9IChDQUxheWVyPEFWUGxheWVyTGF5ZXI+Kil2aWRl b0xheWVyOworICAgIGdldFBsYXllckNvbnRyb2xsZXIoKS5wbGF5ZXJMYXllciA9IChDQUxheWVy PEFWUGxheWVyTGF5ZXI+Kil2aWRlb0xheWVyOwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5XaXRoQ29tcGxldGlvbkhhbmRsZXIoc3Rk OjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb24pCkBAIC0yNzksMTAgKzI4OSwxMCBAQCB2b2lk IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5XaXRoQ29t cGxldGlvbkhhbmRsZXIoc3RkOgogICAgIAogICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCksIFtzdHJvbmdUaGlzLCBjb21wbGV0aW9uXXsKICAgICAgICAgc3Ryb25n VGhpcy0+bV9wbGF5ZXJWaWV3Q29udHJvbGxlciA9IFtbW2NsYXNzQVZQbGF5ZXJWaWV3Q29udHJv bGxlciBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwotICAgICAgICBzdHJvbmdUaGlzLT5tX3Bs YXllclZpZXdDb250cm9sbGVyLmdldCgpLnBsYXllckNvbnRyb2xsZXIgPSAoQVZQbGF5ZXJDb250 cm9sbGVyICopc3Ryb25nVGhpcy0+bV9wbGF5ZXJDb250cm9sbGVyLmdldCgpOworICAgICAgICBz dHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyLmdldCgpLnBsYXllckNvbnRyb2xsZXIg PSAoQVZQbGF5ZXJDb250cm9sbGVyICopc3Ryb25nVGhpcy0+Z2V0UGxheWVyQ29udHJvbGxlcigp OwogICAgICAgICAKICAgICAgICAgaWYgKFtzdHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9s bGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0RGVsZWdhdGU6KV0pCi0gICAgICAg ICAgICBzdHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0g c3Ryb25nVGhpcy0+bV9wbGF5ZXJDb250cm9sbGVyLmdldCgpOworICAgICAgICAgICAgc3Ryb25n VGhpcy0+bV9wbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKS5kZWxlZ2F0ZSA9IHN0cm9uZ1RoaXMt PmdldFBsYXllckNvbnRyb2xsZXIoKTsKICAgICAgICAgCiAgICAgICAgIHN0cm9uZ1RoaXMtPm1f dmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbY2xhc3NVSVZpZXdDb250cm9sbGVyIGFsbG9jXSBp bml0XSk7CiAgICAgICAgIAo= 223759 2014-02-10 15:52:01 -0800 2014-02-10 16:05:17 -0800 Patch bug-128558-20140210155201.patch text/plain 6649 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBmMWJmMjMxZTFkMTdm NzczNTA1ZGEyNTg0MzYzOGI5NWMxMzFjMS4uODVlMDU4YzFjYTg5ZDIwZjUzY2E3YTliZmRhNjcw N2U1MmM1Nzk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTEwICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBXSzIgQVZLaXQgZW50ZXIg ZnVsbHNjcmVlbiBkb2Vzbid0IHdvcmsgYSBzZWNvbmQgdGltZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODU1OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhemlseSBjcmVhdGUgV2ViQVZQbGF5ZXJD b250cm9sbGVyIHdoZW4gbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0KToKKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpnZXRQbGF5ZXJDb250cm9s bGVyKToKKyAgICAgICAgQWRkIGdldFBsYXllckNvbnRyb2xsZXIoKQorCisgICAgICAgIChXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwp OgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldER1cmF0aW9u KToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRDdXJyZW50 VGltZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0UmF0 ZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0VmlkZW9E aW1lbnNpb25zKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojpz ZXRWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjplbnRlckZ1bGxzY3JlZW5XaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICB1c2UgZ2V0 UGxheWVyQ29udHJvbGxlcigpOworCiAyMDE0LTAyLTEwICBSb2dlciBGb25nICA8cm9nZXJfZm9u Z0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbmRvd3NdIFVucmV2aWV3ZWQgdGVzdCBmaXguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCmluZGV4IDZiOGI4YzY3Y2RjYjUyZTdiZGFmYTE2OWVh MTU2MGFmMzRlZjY2MmEuLmU5ZjZhNTAxZTFiYzBiNGVmNmM0YjhhYjg0MjFjNWUxYjQ1YWQyNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCkBAIC01Myw2ICs1Myw4IEBAIGNsYXNzIFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0CiAgICAgUmV0YWluUHRyPFVJVmlld0NvbnRy b2xsZXI+IG1fdmlld0NvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFVJV2luZG93PiBtX3dpbmRv dzsKICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCogbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbDsK KyAgICAgICAgCisgICAgV2ViQVZQbGF5ZXJDb250cm9sbGVyICpnZXRQbGF5ZXJDb250cm9sbGVy KCk7CiAgICAgCiBwdWJsaWM6CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCAyYmZhNTdkOTMxOWYwYThmODJi MjUwNDBiZTg5NThhYzQ5YzcxOGVjLi40ZTgyYzIyZDY0ODAyNWFmYTJlMmM0ZTRlNzgxZjc0Y2U2 YTgwZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC0yMTQsMTkgKzIxNCwz MCBAQCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6V2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQoKQogICAgIGluaXRBVlZhbHVlVGltaW5nKCk7CiAgICAgaW5pdFVJVmll d0NvbnRyb2xsZXIoKTsKICAgICBpbml0QVZQbGF5ZXJMYXllcigpOworfQorCitXZWJBVlBsYXll ckNvbnRyb2xsZXIgKldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpnZXRQbGF5ZXJD b250cm9sbGVyKCkKK3sKKyAgICBpZiAoIW1fcGxheWVyQ29udHJvbGxlcikKKyAgICB7CisgICAg ICAgIG1fcGxheWVyQ29udHJvbGxlciA9IGFkb3B0TlMoW1tXZWJBVlBsYXllckNvbnRyb2xsZXIg YWxsb2NdIGluaXRdKTsKKyAgICAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCisgICAg ICAgICAgICBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSBtX3ZpZGVvRnVsbHNj cmVlbk1vZGVsOworICAgIH0KICAgICAKLSAgICBtX3BsYXllckNvbnRyb2xsZXIgPSBhZG9wdE5T KFtbV2ViQVZQbGF5ZXJDb250cm9sbGVyIGFsbG9jXSBpbml0XSk7CisgICAgcmV0dXJuIG1fcGxh eWVyQ29udHJvbGxlci5nZXQoKTsKIH0KIAorCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpzZXRXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbChXZWJWaWRlb0Z1bGxzY3JlZW5N b2RlbCogbW9kZWwpCiB7CiAgICAgbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbCA9IG1vZGVsOwotICAg IG1fcGxheWVyQ29udHJvbGxlci5nZXQoKS5kZWxlZ2F0ZSA9IG1fdmlkZW9GdWxsc2NyZWVuTW9k ZWw7CisgICAgZ2V0UGxheWVyQ29udHJvbGxlcigpLmRlbGVnYXRlID0gbV92aWRlb0Z1bGxzY3Jl ZW5Nb2RlbDsKIH0KIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0 RHVyYXRpb24oZG91YmxlIGR1cmF0aW9uKQogewotICAgIFdlYkFWUGxheWVyQ29udHJvbGxlciog cGxheWVyQ29udHJvbGxlciA9IG1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICBXZWJBVlBs YXllckNvbnRyb2xsZXIqIHBsYXllckNvbnRyb2xsZXIgPSBnZXRQbGF5ZXJDb250cm9sbGVyKCk7 CiAgICAgCiAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjcwMTcgdXNlIGNvcnJlY3QgdmFsdWVzIGluc3RlYWQgb2YgZHVyYXRpb24gZm9yIGFs bCB0aGVzZQogICAgIHBsYXllckNvbnRyb2xsZXIuY29udGVudER1cmF0aW9uID0gZHVyYXRpb247 CkBAIC0yNDYsMzEgKzI1NywzMSBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpzZXREdXJhdGlvbihkb3VibGUgZHVyYXRpb24pCiAKIHZvaWQgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OnNldEN1cnJlbnRUaW1lKGRvdWJsZSBjdXJyZW50VGltZSwgZG91 YmxlIGFuY2hvclRpbWUpCiB7Ci0gICAgTlNUaW1lSW50ZXJ2YWwgYW5jaG9yVGltZVN0YW1wID0g IVttX3BsYXllckNvbnRyb2xsZXIgcmF0ZV0gPyBOQU4gOiBhbmNob3JUaW1lOworICAgIE5TVGlt ZUludGVydmFsIGFuY2hvclRpbWVTdGFtcCA9ICFbZ2V0UGxheWVyQ29udHJvbGxlcigpIHJhdGVd ID8gTkFOIDogYW5jaG9yVGltZTsKICAgICBBVlZhbHVlVGltaW5nICp0aW1pbmcgPSBbY2xhc3NB VlZhbHVlVGltaW5nIHZhbHVlVGltaW5nV2l0aEFuY2hvclZhbHVlOmN1cnJlbnRUaW1lCiAgICAg ICAgIGFuY2hvclRpbWVTdGFtcDphbmNob3JUaW1lU3RhbXAgcmF0ZTowXTsKLSAgICBtX3BsYXll ckNvbnRyb2xsZXIuZ2V0KCkudGltaW5nID0gdGltaW5nOworICAgIGdldFBsYXllckNvbnRyb2xs ZXIoKS50aW1pbmcgPSB0aW1pbmc7CiB9CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQ6OnNldFJhdGUoYm9vbCBpc1BsYXlpbmcsIGZsb2F0IHBsYXliYWNrUmF0ZSkKIHsK LSAgICBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkucmF0ZSA9IGlzUGxheWluZyA/IHBsYXliYWNr UmF0ZSA6IDAuOworICAgIGdldFBsYXllckNvbnRyb2xsZXIoKS5yYXRlID0gaXNQbGF5aW5nID8g cGxheWJhY2tSYXRlIDogMC47CiB9CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OnNldFZpZGVvRGltZW5zaW9ucyhib29sIGhhc1ZpZGVvLCBmbG9hdCB3aWR0aCwgZmxv YXQgaGVpZ2h0KQogewotICAgIG1fcGxheWVyQ29udHJvbGxlci5nZXQoKS5oYXNFbmFibGVkVmlk ZW8gPSBoYXNWaWRlbzsKLSAgICBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkuY29udGVudERpbWVu c2lvbnMgPSBDR1NpemVNYWtlKHdpZHRoLCBoZWlnaHQpOworICAgIGdldFBsYXllckNvbnRyb2xs ZXIoKS5oYXNFbmFibGVkVmlkZW8gPSBoYXNWaWRlbzsKKyAgICBnZXRQbGF5ZXJDb250cm9sbGVy KCkuY29udGVudERpbWVuc2lvbnMgPSBDR1NpemVNYWtlKHdpZHRoLCBoZWlnaHQpOwogfQogCiB2 b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRWaWRlb0xheWVyKFBsYXRm b3JtTGF5ZXIqIHZpZGVvTGF5ZXIpCiB7Ci0gICAgW21fcGxheWVyQ29udHJvbGxlci5nZXQoKS5w bGF5ZXJMYXllciByZW1vdmVGcm9tU3VwZXJsYXllcl07CisgICAgW2dldFBsYXllckNvbnRyb2xs ZXIoKS5wbGF5ZXJMYXllciByZW1vdmVGcm9tU3VwZXJsYXllcl07CiAgICAgW3ZpZGVvTGF5ZXIg cmVtb3ZlRnJvbVN1cGVybGF5ZXJdOwogICAgIEFTU0VSVCghdmlkZW9MYXllcgogICAgICAgICB8 fCBbdmlkZW9MYXllciBpc0tpbmRPZkNsYXNzOltjbGFzc0FWUGxheWVyTGF5ZXIgY2xhc3NdXQog ICAgICAgICB8fCAoW3ZpZGVvTGF5ZXIgaXNLaW5kT2ZDbGFzczpbQ0FMYXllciBjbGFzc11dICYm IFt2aWRlb0xheWVyIGNvbmZvcm1zVG9Qcm90b2NvbDpAcHJvdG9jb2woQVZQbGF5ZXJMYXllcild KSk7Ci0gICAgbV9wbGF5ZXJDb250cm9sbGVyLmdldCgpLnBsYXllckxheWVyID0gKENBTGF5ZXI8 QVZQbGF5ZXJMYXllcj4qKXZpZGVvTGF5ZXI7CisgICAgZ2V0UGxheWVyQ29udHJvbGxlcigpLnBs YXllckxheWVyID0gKENBTGF5ZXI8QVZQbGF5ZXJMYXllcj4qKXZpZGVvTGF5ZXI7CiB9CiAKIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbldpdGhD b21wbGV0aW9uSGFuZGxlcihzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlvbikKQEAgLTI3 OSwxMCArMjkwLDEwIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVu dGVyRnVsbHNjcmVlbldpdGhDb21wbGV0aW9uSGFuZGxlcihzdGQ6CiAgICAgCiAgICAgZGlzcGF0 Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0cm9uZ1RoaXMsIGNvbXBsZXRp b25dewogICAgICAgICBzdHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyID0gW1tbY2xh c3NBVlBsYXllclZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07Ci0gICAg ICAgIHN0cm9uZ1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkucGxheWVyQ29udHJv bGxlciA9IChBVlBsYXllckNvbnRyb2xsZXIgKilzdHJvbmdUaGlzLT5tX3BsYXllckNvbnRyb2xs ZXIuZ2V0KCk7CisgICAgICAgIHN0cm9uZ1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0 KCkucGxheWVyQ29udHJvbGxlciA9IChBVlBsYXllckNvbnRyb2xsZXIgKilzdHJvbmdUaGlzLT5n ZXRQbGF5ZXJDb250cm9sbGVyKCk7CiAgICAgICAgIAogICAgICAgICBpZiAoW3N0cm9uZ1RoaXMt Pm1fcGxheWVyVmlld0NvbnRyb2xsZXIgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRE ZWxlZ2F0ZTopXSkKLSAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xs ZXIuZ2V0KCkuZGVsZWdhdGUgPSBzdHJvbmdUaGlzLT5tX3BsYXllckNvbnRyb2xsZXIuZ2V0KCk7 CisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3BsYXllclZpZXdDb250cm9sbGVyLmdldCgpLmRl bGVnYXRlID0gc3Ryb25nVGhpcy0+Z2V0UGxheWVyQ29udHJvbGxlcigpOwogICAgICAgICAKICAg ICAgICAgc3Ryb25nVGhpcy0+bV92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tjbGFzc1VJVmll d0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAgICAgICAgCg== 223761 2014-02-10 16:05:21 -0800 2014-02-15 00:20:21 -0800 Patch bug-128558-20140210160521.patch text/plain 6616 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBmMWJmMjMxZTFkMTdm NzczNTA1ZGEyNTg0MzYzOGI5NWMxMzFjMS4uODVlMDU4YzFjYTg5ZDIwZjUzY2E3YTliZmRhNjcw N2U1MmM1Nzk0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTEwICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBXSzIgQVZLaXQgZW50ZXIg ZnVsbHNjcmVlbiBkb2Vzbid0IHdvcmsgYSBzZWNvbmQgdGltZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODU1OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhemlseSBjcmVhdGUgV2ViQVZQbGF5ZXJD b250cm9sbGVyIHdoZW4gbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0KToKKyAg ICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpnZXRQbGF5ZXJDb250cm9s bGVyKToKKyAgICAgICAgQWRkIGdldFBsYXllckNvbnRyb2xsZXIoKQorCisgICAgICAgIChXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwp OgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldER1cmF0aW9u KToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpzZXRDdXJyZW50 VGltZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0UmF0 ZSk6CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0VmlkZW9E aW1lbnNpb25zKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojpz ZXRWaWRlb0xheWVyKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjplbnRlckZ1bGxzY3JlZW5XaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICB1c2UgZ2V0 UGxheWVyQ29udHJvbGxlcigpOworCiAyMDE0LTAyLTEwICBSb2dlciBGb25nICA8cm9nZXJfZm9u Z0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbmRvd3NdIFVucmV2aWV3ZWQgdGVzdCBmaXguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCmluZGV4IDZiOGI4YzY3Y2RjYjUyZTdiZGFmYTE2OWVh MTU2MGFmMzRlZjY2MmEuLmY0ZTZjMWZiNmI4Y2NlOWQ0NzZjMDQxMDFiOTE1OGU5ZmUwYzE4YjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oCkBAIC01Myw2ICs1Myw4IEBAIGNsYXNzIFdl YlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0CiAgICAgUmV0YWluUHRyPFVJVmlld0NvbnRy b2xsZXI+IG1fdmlld0NvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFVJV2luZG93PiBtX3dpbmRv dzsKICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCogbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbDsK KyAgICAgICAgCisgICAgV2ViQVZQbGF5ZXJDb250cm9sbGVyICpwbGF5ZXJDb250cm9sbGVyKCk7 CiAgICAgCiBwdWJsaWM6CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQppbmRleCAyYmZhNTdkOTMxOWYwYThmODJiMjUw NDBiZTg5NThhYzQ5YzcxOGVjLi4wOGY1ZDhkYzg1NzNmODgxNzE4MTI1ZDNhNjE4MmQ3NjBmNzVk ZDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC0yMTQsMTkgKzIxNCwzMCBA QCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6V2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQoKQogICAgIGluaXRBVlZhbHVlVGltaW5nKCk7CiAgICAgaW5pdFVJVmlld0Nv bnRyb2xsZXIoKTsKICAgICBpbml0QVZQbGF5ZXJMYXllcigpOworfQorCitXZWJBVlBsYXllckNv bnRyb2xsZXIgKldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpwbGF5ZXJDb250cm9s bGVyKCkKK3sKKyAgICBpZiAoIW1fcGxheWVyQ29udHJvbGxlcikKKyAgICB7CisgICAgICAgIG1f cGxheWVyQ29udHJvbGxlciA9IGFkb3B0TlMoW1tXZWJBVlBsYXllckNvbnRyb2xsZXIgYWxsb2Nd IGluaXRdKTsKKyAgICAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwpCisgICAgICAgICAg ICBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSBtX3ZpZGVvRnVsbHNjcmVlbk1v ZGVsOworICAgIH0KICAgICAKLSAgICBtX3BsYXllckNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV2Vi QVZQbGF5ZXJDb250cm9sbGVyIGFsbG9jXSBpbml0XSk7CisgICAgcmV0dXJuIG1fcGxheWVyQ29u dHJvbGxlci5nZXQoKTsKIH0KIAorCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpzZXRXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCog bW9kZWwpCiB7CiAgICAgbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbCA9IG1vZGVsOwotICAgIG1fcGxh eWVyQ29udHJvbGxlci5nZXQoKS5kZWxlZ2F0ZSA9IG1fdmlkZW9GdWxsc2NyZWVuTW9kZWw7Cisg ICAgcGxheWVyQ29udHJvbGxlcigpLmRlbGVnYXRlID0gbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbDsK IH0KIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0RHVyYXRpb24o ZG91YmxlIGR1cmF0aW9uKQogewotICAgIFdlYkFWUGxheWVyQ29udHJvbGxlciogcGxheWVyQ29u dHJvbGxlciA9IG1fcGxheWVyQ29udHJvbGxlci5nZXQoKTsKKyAgICBXZWJBVlBsYXllckNvbnRy b2xsZXIqIHBsYXllckNvbnRyb2xsZXIgPSB0aGlzLT5wbGF5ZXJDb250cm9sbGVyKCk7CiAgICAg CiAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjcwMTcgdXNlIGNvcnJlY3QgdmFsdWVzIGluc3RlYWQgb2YgZHVyYXRpb24gZm9yIGFsbCB0aGVz ZQogICAgIHBsYXllckNvbnRyb2xsZXIuY29udGVudER1cmF0aW9uID0gZHVyYXRpb247CkBAIC0y NDYsMzEgKzI1NywzMSBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojpz ZXREdXJhdGlvbihkb3VibGUgZHVyYXRpb24pCiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OnNldEN1cnJlbnRUaW1lKGRvdWJsZSBjdXJyZW50VGltZSwgZG91YmxlIGFu Y2hvclRpbWUpCiB7Ci0gICAgTlNUaW1lSW50ZXJ2YWwgYW5jaG9yVGltZVN0YW1wID0gIVttX3Bs YXllckNvbnRyb2xsZXIgcmF0ZV0gPyBOQU4gOiBhbmNob3JUaW1lOworICAgIE5TVGltZUludGVy dmFsIGFuY2hvclRpbWVTdGFtcCA9ICFbcGxheWVyQ29udHJvbGxlcigpIHJhdGVdID8gTkFOIDog YW5jaG9yVGltZTsKICAgICBBVlZhbHVlVGltaW5nICp0aW1pbmcgPSBbY2xhc3NBVlZhbHVlVGlt aW5nIHZhbHVlVGltaW5nV2l0aEFuY2hvclZhbHVlOmN1cnJlbnRUaW1lCiAgICAgICAgIGFuY2hv clRpbWVTdGFtcDphbmNob3JUaW1lU3RhbXAgcmF0ZTowXTsKLSAgICBtX3BsYXllckNvbnRyb2xs ZXIuZ2V0KCkudGltaW5nID0gdGltaW5nOworICAgIHBsYXllckNvbnRyb2xsZXIoKS50aW1pbmcg PSB0aW1pbmc7CiB9CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNl dFJhdGUoYm9vbCBpc1BsYXlpbmcsIGZsb2F0IHBsYXliYWNrUmF0ZSkKIHsKLSAgICBtX3BsYXll ckNvbnRyb2xsZXIuZ2V0KCkucmF0ZSA9IGlzUGxheWluZyA/IHBsYXliYWNrUmF0ZSA6IDAuOwor ICAgIHBsYXllckNvbnRyb2xsZXIoKS5yYXRlID0gaXNQbGF5aW5nID8gcGxheWJhY2tSYXRlIDog MC47CiB9CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldFZpZGVv RGltZW5zaW9ucyhib29sIGhhc1ZpZGVvLCBmbG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0KQogewot ICAgIG1fcGxheWVyQ29udHJvbGxlci5nZXQoKS5oYXNFbmFibGVkVmlkZW8gPSBoYXNWaWRlbzsK LSAgICBtX3BsYXllckNvbnRyb2xsZXIuZ2V0KCkuY29udGVudERpbWVuc2lvbnMgPSBDR1NpemVN YWtlKHdpZHRoLCBoZWlnaHQpOworICAgIHBsYXllckNvbnRyb2xsZXIoKS5oYXNFbmFibGVkVmlk ZW8gPSBoYXNWaWRlbzsKKyAgICBwbGF5ZXJDb250cm9sbGVyKCkuY29udGVudERpbWVuc2lvbnMg PSBDR1NpemVNYWtlKHdpZHRoLCBoZWlnaHQpOwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpzZXRWaWRlb0xheWVyKFBsYXRmb3JtTGF5ZXIqIHZpZGVvTGF5ZXIp CiB7Ci0gICAgW21fcGxheWVyQ29udHJvbGxlci5nZXQoKS5wbGF5ZXJMYXllciByZW1vdmVGcm9t U3VwZXJsYXllcl07CisgICAgW3BsYXllckNvbnRyb2xsZXIoKS5wbGF5ZXJMYXllciByZW1vdmVG cm9tU3VwZXJsYXllcl07CiAgICAgW3ZpZGVvTGF5ZXIgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOwog ICAgIEFTU0VSVCghdmlkZW9MYXllcgogICAgICAgICB8fCBbdmlkZW9MYXllciBpc0tpbmRPZkNs YXNzOltjbGFzc0FWUGxheWVyTGF5ZXIgY2xhc3NdXQogICAgICAgICB8fCAoW3ZpZGVvTGF5ZXIg aXNLaW5kT2ZDbGFzczpbQ0FMYXllciBjbGFzc11dICYmIFt2aWRlb0xheWVyIGNvbmZvcm1zVG9Q cm90b2NvbDpAcHJvdG9jb2woQVZQbGF5ZXJMYXllcildKSk7Ci0gICAgbV9wbGF5ZXJDb250cm9s bGVyLmdldCgpLnBsYXllckxheWVyID0gKENBTGF5ZXI8QVZQbGF5ZXJMYXllcj4qKXZpZGVvTGF5 ZXI7CisgICAgcGxheWVyQ29udHJvbGxlcigpLnBsYXllckxheWVyID0gKENBTGF5ZXI8QVZQbGF5 ZXJMYXllcj4qKXZpZGVvTGF5ZXI7CiB9CiAKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbldpdGhDb21wbGV0aW9uSGFuZGxlcihzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4gY29tcGxldGlvbikKQEAgLTI3OSwxMCArMjkwLDEwIEBAIHZvaWQgV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbldpdGhDb21wbGV0aW9u SGFuZGxlcihzdGQ6CiAgICAgCiAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5f cXVldWUoKSwgW3N0cm9uZ1RoaXMsIGNvbXBsZXRpb25dewogICAgICAgICBzdHJvbmdUaGlzLT5t X3BsYXllclZpZXdDb250cm9sbGVyID0gW1tbY2xhc3NBVlBsYXllclZpZXdDb250cm9sbGVyIGFs bG9jXSBpbml0XSBhdXRvcmVsZWFzZV07Ci0gICAgICAgIHN0cm9uZ1RoaXMtPm1fcGxheWVyVmll d0NvbnRyb2xsZXIuZ2V0KCkucGxheWVyQ29udHJvbGxlciA9IChBVlBsYXllckNvbnRyb2xsZXIg KilzdHJvbmdUaGlzLT5tX3BsYXllckNvbnRyb2xsZXIuZ2V0KCk7CisgICAgICAgIHN0cm9uZ1Ro aXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkucGxheWVyQ29udHJvbGxlciA9IChBVlBs YXllckNvbnRyb2xsZXIgKilzdHJvbmdUaGlzLT5wbGF5ZXJDb250cm9sbGVyKCk7CiAgICAgICAg IAogICAgICAgICBpZiAoW3N0cm9uZ1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXREZWxlZ2F0ZTopXSkKLSAgICAgICAgICAgIHN0cm9u Z1RoaXMtPm1fcGxheWVyVmlld0NvbnRyb2xsZXIuZ2V0KCkuZGVsZWdhdGUgPSBzdHJvbmdUaGlz LT5tX3BsYXllckNvbnRyb2xsZXIuZ2V0KCk7CisgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3Bs YXllclZpZXdDb250cm9sbGVyLmdldCgpLmRlbGVnYXRlID0gc3Ryb25nVGhpcy0+cGxheWVyQ29u dHJvbGxlcigpOwogICAgICAgICAKICAgICAgICAgc3Ryb25nVGhpcy0+bV92aWV3Q29udHJvbGxl ciA9IGFkb3B0TlMoW1tjbGFzc1VJVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAgICAg ICAgCg==