147186 2015-07-22 00:14:36 -0700 Adopt AVKit's AVSimplePlayerLayerView change for PiP. 2015-07-22 14:28:49 -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 jer.noble jonlee webkit-bug-importer oldest_to_newest 1111217 0 jeremyj-wk 2015-07-22 00:14:36 -0700 Adopt AVKit's AVSimplePlayerLayerView change for PiP. 1111218 1 jeremyj-wk 2015-07-22 00:16:09 -0700 rdar://problem/21928170 1111220 2 257246 jeremyj-wk 2015-07-22 00:25:08 -0700 Created attachment 257246 Patch 1111224 3 257249 jeremyj-wk 2015-07-22 00:38:33 -0700 Created attachment 257249 Patch 1111378 4 257285 jeremyj-wk 2015-07-22 12:25:58 -0700 Created attachment 257285 Patch 1111419 5 257285 commit-queue 2015-07-22 14:28:47 -0700 Comment on attachment 257285 Patch Clearing flags on attachment: 257285 Committed r187181: <http://trac.webkit.org/changeset/187181> 1111420 6 commit-queue 2015-07-22 14:28:49 -0700 All reviewed patches have been landed. Closing bug. 257246 2015-07-22 00:25:08 -0700 2015-07-22 00:38:29 -0700 Patch bug-147186-20150722002354.patch text/plain 10015 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk2ZjBhNzdjMDQzMGQy YjkyYzRlNGMyNzU0NzA4NzMzY2QwNGRkOS4uZmYwMDNhZWVhZWE4NDMwNzhiNGMzNmM2MGVlMmJh NTVlOGE5ZTMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA3LTIyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBBZG9wdCBBVktpdCdzIEFW U2ltcGxlUGxheWVyTGF5ZXJWaWV3IGNoYW5nZSBmb3IgUGlQLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTg2CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yMTkyODE3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBVlNpbXBsZVBsYXllckxheWVyVmlldyByZXBsYWNlcyBBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXcgYXMgdGhlIG93bmVyIG9mCisgICAgICAgIHRoZSBBVlBsYXllckxh eWVyIGZvciBQaVAuIFRoaXMgYWxsb3dzIHRoZSByZW1vdmFsIG9mIFdlYkFWUGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlldworICAgICAgICBhbmQgYWRkaXRpb24gb2YgV2ViQVZTaW1wbGVQ bGF5ZXJMYXllclZpZXcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgIChXZWJBVlNpbXBsZVBsYXllckxheWVyVmll d19sYXllckNsYXNzKTogQWRkZWQuCisgICAgICAgIChnZXRXZWJBVlNpbXBsZVBsYXllckxheWVy Vmlld0NsYXNzKTogQWRkZWQuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld19sYXllckNs YXNzKTogU3R5bGUuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld19wbGF5ZXJDb250cm9s bGVyKTogU3R5bGUuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld192aWRlb1ZpZXcpOiBT dHlsZS4KKyAgICAgICAgKFdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0YXJ0Um91dGluZ1ZpZGVvVG9Q aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KTogYWRvcHQgLWF0dGFjaAorICAgICAgICAo V2ViQVZQbGF5ZXJMYXllclZpZXdfc3RvcFJvdXRpbmdWaWRlb1RvUGljdHVyZUluUGljdHVyZVBs YXllckxheWVyVmlldyk6IGFkb3B0IC1kZXRhY2gKKyAgICAgICAgKFdlYkFWUGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlld19sYXllckNsYXNzKTogRGVsZXRlZC4KKyAgICAgICAgKGdldFdl YkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkFWUGxheWVyTGF5ZXJWaWV3X3BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcp OiBEZWxldGVkLgorICAgICAgICAoV2ViQVZQbGF5ZXJMYXllclZpZXdfZGVhbGxvYyk6IERlbGV0 ZWQuCisgICAgICAgIChnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9zcGkvY29jb2EvQVZLaXRTUEkuaDogQWRkIGNvcnJlc29uZGluZyBB VktpdCBTUEkuCisKIDIwMTUtMDctMjEgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0NTUyBTZWxlY3RvcnMgTGV2ZWwgNF0gQWRkICNpZmRlZnMgdG8g dGhlIG5ldyAnPj4nIGRlc2NlbmRhbnQgY29tYmluYXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0Lm1tCmluZGV4IDI3NDc4ZGU2NmZjOGU0NDEyZTZiNzI2NjI5NjUzZTkwMDRjMjY4YzEuLjRh MWMzMTdlY2Y1MDAxZTQ1M2VmZmExY2I5ZTIwODEwOTUwY2Y3OGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQubW0KQEAgLTYxLDcgKzYxLDcgQEAgU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBB VlBsYXllckNvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyVmlld0Nv bnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWVmFsdWVUaW1pbmcpCiBTT0ZUX0xJ TktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyTGF5ZXJWaWV3KQotU09GVF9MSU5LX0NMQVNTKEFWS2l0 LCBBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcpCitTT0ZUX0xJTktfQ0xBU1MoQVZL aXQsIEFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0 KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUFwcGxpY2F0aW9uKQpAQCAtNzM1LDIzICs3MzUs MjMgQEAgc3RhdGljIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNj cmVlblJlYXNvbiBjb252ZXJ0VG9FeGl0RnVsbFMKIAogQGVuZAogCi1AaW50ZXJmYWNlIFdlYkFW UGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyA6IEFWUGljdHVyZUluUGljdHVyZVBsYXll ckxheWVyVmlldworQGludGVyZmFjZSBXZWJBVlNpbXBsZVBsYXllckxheWVyVmlldyA6IEFWU2lt cGxlUGxheWVyTGF5ZXJWaWV3CiBAZW5kCiAKLXN0YXRpYyBDQUxheWVyKiBXZWJBVlBpY3R1cmVJ blBpY3R1cmVQbGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQorc3RhdGljIENBTGF5 ZXIqIFdlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MoaWQsIFNFTCkKIHsKICAg ICByZXR1cm4gW1dlYkFWUGxheWVyTGF5ZXIgY2xhc3NdOwogfQogCi1zdGF0aWMgQ2xhc3MgZ2V0 V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKQorc3RhdGljIENsYXNz IGdldFdlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKQogewogICAgIHN0YXRpYyBDbGFz cyB0aGVDbGFzcyA9IG5pbDsKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsK ICAgICBkaXNwYXRjaF9vbmNlKCZvbmNlVG9rZW4sIF57Ci0gICAgICAgIHRoZUNsYXNzID0gb2Jq Y19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdD bGFzcygpLCAiV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3IiwgMCk7CisgICAg ICAgIHRoZUNsYXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlNpbXBsZVBsYXllckxh eWVyVmlld0NsYXNzKCksICJXZWJBVlNpbXBsZVBsYXllckxheWVyVmlldyIsIDApOwogICAgICAg ICBvYmpjX3JlZ2lzdGVyQ2xhc3NQYWlyKHRoZUNsYXNzKTsKLSAgICAgICAgQ2xhc3MgbWV0YUNs YXNzID0gb2JqY19nZXRNZXRhQ2xhc3MoIldlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVy VmlldyIpOwotICAgICAgICBjbGFzc19hZGRNZXRob2QobWV0YUNsYXNzLCBAc2VsZWN0b3IobGF5 ZXJDbGFzcyksIChJTVApV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3X2xheWVy Q2xhc3MsICJAQDoiKTsKKyAgICAgICAgQ2xhc3MgbWV0YUNsYXNzID0gb2JqY19nZXRNZXRhQ2xh c3MoIldlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3Iik7CisgICAgICAgIGNsYXNzX2FkZE1ldGhv ZChtZXRhQ2xhc3MsIEBzZWxlY3RvcihsYXllckNsYXNzKSwgKElNUClXZWJBVlNpbXBsZVBsYXll ckxheWVyVmlld19sYXllckNsYXNzLCAiQEA6Iik7CiAgICAgfSk7CiAgICAgCiAgICAgcmV0dXJu IHRoZUNsYXNzOwpAQCAtNzYxLDEyICs3NjEsMTIgQEAgc3RhdGljIENsYXNzIGdldFdlYkFWUGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0NsYXNzKCkKIEBwcm9wZXJ0eSAocmV0YWluKSBV SVZpZXcqIHZpZGVvVmlldzsKIEBlbmQKIAotc3RhdGljIENBTGF5ZXIqIFdlYkFWUGxheWVyTGF5 ZXJWaWV3X2xheWVyQ2xhc3MoaWQsIFNFTCkKK3N0YXRpYyBDQUxheWVyICpXZWJBVlBsYXllckxh eWVyVmlld19sYXllckNsYXNzKGlkLCBTRUwpCiB7CiAgICAgcmV0dXJuIFtXZWJBVlBsYXllckxh eWVyIGNsYXNzXTsKIH0KIAotc3RhdGljIEFWUGxheWVyQ29udHJvbGxlciogV2ViQVZQbGF5ZXJM YXllclZpZXdfcGxheWVyQ29udHJvbGxlcihpZCBhU2VsZiwgU0VMKQorc3RhdGljIEFWUGxheWVy Q29udHJvbGxlciAqV2ViQVZQbGF5ZXJMYXllclZpZXdfcGxheWVyQ29udHJvbGxlcihpZCBhU2Vs ZiwgU0VMKQogewogICAgIEFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllciA9IGFTZWxmOwog ICAgIFdlYkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXll ciAqKVtwbGF5ZXJMYXllciBwbGF5ZXJMYXllcl07CkBAIC03ODAsNyArNzgwLDcgQEAgc3RhdGlj IHZvaWQgV2ViQVZQbGF5ZXJMYXllclZpZXdfc2V0UGxheWVyQ29udHJvbGxlcihpZCBhU2VsZiwg U0VMLCBBVlBsYXllckNvbnQKICAgICBbd2ViQVZQbGF5ZXJMYXllciBzZXRQbGF5ZXJDb250cm9s bGVyOiBwbGF5ZXJDb250cm9sbGVyXTsKIH0KIAotc3RhdGljIFVJVmlldyogV2ViQVZQbGF5ZXJM YXllclZpZXdfdmlkZW9WaWV3KGlkIGFTZWxmLCBTRUwpCitzdGF0aWMgVUlWaWV3ICpXZWJBVlBs YXllckxheWVyVmlld192aWRlb1ZpZXcoaWQgYVNlbGYsIFNFTCkKIHsKICAgICBBVlBsYXllckxh eWVyVmlldyAqcGxheWVyTGF5ZXIgPSBhU2VsZjsKICAgICBXZWJBVlBsYXllckxheWVyICp3ZWJB VlBsYXllckxheWVyID0gKFdlYkFWUGxheWVyTGF5ZXIgKilbcGxheWVyTGF5ZXIgcGxheWVyTGF5 ZXJdOwpAQCAtODAyLDcgKzgwMiw5IEBAIHN0YXRpYyB2b2lkIFdlYkFWUGxheWVyTGF5ZXJWaWV3 X3N0YXJ0Um91dGluZ1ZpZGVvVG9QaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWCiB7CiAgICAg V2ViQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwogICAgIEFWUGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqcGlwVmlldyA9IFtwbGF5ZXJMYXllclZpZXcg cGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld107Ci0KKyAgICBbcGlwVmlldyBfc2V0UGxh eWVyTGF5ZXJWaWV3Q2xhc3M6Z2V0V2ViQVZTaW1wbGVQbGF5ZXJMYXllclZpZXdDbGFzcygpXTsK KyAgICAKKyAgICBbcGlwVmlldyBhdHRhY2hQbGF5ZXJMYXllcl07CiAgICAgV2ViQVZQbGF5ZXJM YXllciAqcGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtwbGF5ZXJMYXllclZpZXcg cGxheWVyTGF5ZXJdOwogICAgIFdlYkFWUGxheWVyTGF5ZXIgKnBpcFBsYXllckxheWVyID0gKFdl YkFWUGxheWVyTGF5ZXIgKilbcGlwVmlldyBwbGF5ZXJMYXllcl07CiAgICAgW3BsYXllckxheWVy IHNldFZpZGVvR3Jhdml0eTpnZXRBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0KCldOwpA QCAtODExLDM0ICs4MTMsMTQgQEAgc3RhdGljIHZvaWQgV2ViQVZQbGF5ZXJMYXllclZpZXdfc3Rh cnRSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclYKICAgICBbcGlwUGxh eWVyTGF5ZXIgc2V0VmlkZW9HcmF2aXR5OnBsYXllckxheWVyLnZpZGVvR3Jhdml0eV07CiAgICAg W3BpcFBsYXllckxheWVyIHNldE1vZGVsVmlkZW9MYXllckZyYW1lOnBsYXllckxheWVyLm1vZGVs VmlkZW9MYXllckZyYW1lXTsKICAgICBbcGlwUGxheWVyTGF5ZXIgc2V0UGxheWVyQ29udHJvbGxl cjpwbGF5ZXJMYXllci5wbGF5ZXJDb250cm9sbGVyXTsKLSAgICBbcGlwVmlldyBhZGRTdWJ2aWV3 OnBsYXllckxheWVyVmlldy52aWRlb1ZpZXddOworICAgIFtbcGlwVmlldyBfcGxheWVyTGF5ZXJW aWV3XSBhZGRTdWJ2aWV3OnBsYXllckxheWVyVmlldy52aWRlb1ZpZXddOwogfQogCiBzdGF0aWMg dm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zdG9wUm91dGluZ1ZpZGVvVG9QaWN0dXJlSW5QaWN0 dXJlUGxheWVyTGF5ZXJWaWV3KGlkIGFTZWxmLCBTRUwpCiB7CiAgICAgV2ViQVZQbGF5ZXJMYXll clZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwogICAgIFtwbGF5ZXJMYXllclZpZXcgYWRk U3VidmlldzpwbGF5ZXJMYXllclZpZXcudmlkZW9WaWV3XTsKLX0KLQotc3RhdGljIEFWUGljdHVy ZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqV2ViQVZQbGF5ZXJMYXllclZpZXdfcGljdHVyZUlu UGljdHVyZVBsYXllckxheWVyVmlldyhpZCBhU2VsZiwgU0VMKQotewotICAgIFdlYkFWUGxheWVy TGF5ZXJWaWV3ICpwbGF5ZXJMYXllclZpZXcgPSBhU2VsZjsKLSAgICBXZWJBVlBpY3R1cmVJblBp Y3R1cmVQbGF5ZXJMYXllclZpZXcgKnBpcFZpZXcgPSBbcGxheWVyTGF5ZXJWaWV3IHZhbHVlRm9y S2V5OkAiX3BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXciXTsKLSAgICBpZiAoIXBpcFZp ZXcpIHsKLSAgICAgICAgcGlwVmlldyA9IFtbZ2V0V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVy TGF5ZXJWaWV3Q2xhc3MoKSBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXTsKLSAgICAg ICAgW3BsYXllckxheWVyVmlldyBzZXRWYWx1ZTpwaXBWaWV3IGZvcktleTpAIl9waWN0dXJlSW5Q aWN0dXJlUGxheWVyTGF5ZXJWaWV3Il07Ci0gICAgfQotICAgIHJldHVybiBwaXBWaWV3OwotfQot Ci1zdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19kZWFsbG9jKGlkIGFTZWxmLCBTRUwp Ci17Ci0gICAgV2ViQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwot ICAgIFJldGFpblB0cjxXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXc+IHBpcFZp ZXcgPSBhZG9wdE5TKFtwbGF5ZXJMYXllclZpZXcgdmFsdWVGb3JLZXk6QCJfcGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlldyJdKTsKLSAgICBbcGxheWVyTGF5ZXJWaWV3IHNldFZhbHVlOm5p bCBmb3JLZXk6QCJfcGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyJdOwotICAgIG9iamNf c3VwZXIgc3VwZXJDbGFzcyB7IHBsYXllckxheWVyVmlldywgZ2V0QVZQbGF5ZXJMYXllclZpZXdD bGFzcygpIH07Ci0gICAgYXV0byBzdXBlcl9kZWFsbG9jID0gcmVpbnRlcnByZXRfY2FzdDx2b2lk KCopKG9iamNfc3VwZXIqLCBTRUwpPihvYmpjX21zZ1NlbmRTdXBlcik7Ci0gICAgc3VwZXJfZGVh bGxvYygmc3VwZXJDbGFzcywgQHNlbGVjdG9yKGRlYWxsb2MpKTsKKyAgICBbW3BsYXllckxheWVy VmlldyBwaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3XSBkZXRhY2hQbGF5ZXJMYXllcl07 CiB9CiAKICNwcmFnbWEgbWFyayAtIE1ldGhvZHMKQEAgLTg0OSwxNyArODMxLDEyIEBAIHN0YXRp YyBDbGFzcyBnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKCkKICAgICBzdGF0aWMgZGlzcGF0 Y2hfb25jZV90IG9uY2VUb2tlbjsKICAgICBkaXNwYXRjaF9vbmNlKCZvbmNlVG9rZW4sIF57CiAg ICAgICAgIHRoZUNsYXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlBsYXllckxheWVy Vmlld0NsYXNzKCksICJXZWJBVlBsYXllckxheWVyVmlldyIsIDApOwotICAgICAgICBjbGFzc19h ZGRNZXRob2QodGhlQ2xhc3MsIEBzZWxlY3RvcihkZWFsbG9jKSwgKElNUClXZWJBVlBsYXllckxh eWVyVmlld19kZWFsbG9jLCAidkA6Iik7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZCh0aGVDbGFz cywgQHNlbGVjdG9yKHNldFBsYXllckNvbnRyb2xsZXI6KSwgKElNUClXZWJBVlBsYXllckxheWVy Vmlld19zZXRQbGF5ZXJDb250cm9sbGVyLCAidkA6QCIpOwogICAgICAgICBjbGFzc19hZGRNZXRo b2QodGhlQ2xhc3MsIEBzZWxlY3RvcihwbGF5ZXJDb250cm9sbGVyKSwgKElNUClXZWJBVlBsYXll ckxheWVyVmlld19wbGF5ZXJDb250cm9sbGVyLCAiQEA6Iik7CiAgICAgICAgIGNsYXNzX2FkZE1l dGhvZCh0aGVDbGFzcywgQHNlbGVjdG9yKHNldFZpZGVvVmlldzopLCAoSU1QKVdlYkFWUGxheWVy TGF5ZXJWaWV3X3NldFZpZGVvVmlldywgInZAOkAiKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9k KHRoZUNsYXNzLCBAc2VsZWN0b3IodmlkZW9WaWV3KSwgKElNUClXZWJBVlBsYXllckxheWVyVmll d192aWRlb1ZpZXcsICJAQDoiKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9kKHRoZUNsYXNzLCBA c2VsZWN0b3Ioc3RhcnRSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZp ZXcpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0YXJ0Um91dGluZ1ZpZGVvVG9QaWN0dXJl SW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3LCAidkA6Iik7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhv ZCh0aGVDbGFzcywgQHNlbGVjdG9yKHN0b3BSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQ bGF5ZXJMYXllclZpZXcpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0b3BSb3V0aW5nVmlk ZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcsICJ2QDoiKTsKLSAgICAgICAgY2xh c3NfYWRkTWV0aG9kKHRoZUNsYXNzLCBAc2VsZWN0b3IocGljdHVyZUluUGljdHVyZVBsYXllckxh eWVyVmlldyksIChJTVApV2ViQVZQbGF5ZXJMYXllclZpZXdfcGljdHVyZUluUGljdHVyZVBsYXll ckxheWVyVmlldywgIkBAOiIpOwotICAgICAgICAKLSAgICAgICAgY2xhc3NfYWRkSXZhcih0aGVD bGFzcywgIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Iiwgc2l6ZW9mKFdlYkFWUGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqKSwgbG9nMihzaXplb2YoV2ViQVZQaWN0dXJl SW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICopKSwgIkAiKTsKLSAgICAgICAgCiAgICAgICAgIG9i amNfcmVnaXN0ZXJDbGFzc1BhaXIodGhlQ2xhc3MpOwogICAgICAgICBDbGFzcyBtZXRhQ2xhc3Mg PSBvYmpjX2dldE1ldGFDbGFzcygiV2ViQVZQbGF5ZXJMYXllclZpZXciKTsKICAgICAgICAgY2xh c3NfYWRkTWV0aG9kKG1ldGFDbGFzcywgQHNlbGVjdG9yKGxheWVyQ2xhc3MpLCAoSU1QKVdlYkFW UGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MsICJAQDoiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKaW5kZXggY2M3MTg5Yzc0NGUwOWVjMGFkMDMzYjVh Zjc1OTRlMGRkNjFkNzdlNy4uYmQxYjMxMjdhNDVjYjg5ZjhjYTU2MWQxYzgwNzg3Mzc4NWU2Yjhk YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJ LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKQEAg LTYzLDggKzYzLDE2IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIEFWUGxheWVyQ29udHJv bGxlckV4dGVybmFsUGxheWJhY2tUeXBlKSB7CiAKIEBjbGFzcyBBVlBsYXllckxheWVyOwogCitA aW50ZXJmYWNlIEFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3IDogVUlWaWV3CitAcHJvcGVydHkgKG5v bmF0b21pYywgcmVhZG9ubHkpIEFWUGxheWVyTGF5ZXIgKnBsYXllckxheWVyOworQGVuZAorCiBA aW50ZXJmYWNlIEFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyA6IFVJVmlldworQHBy b3BlcnR5IChub25hdG9taWMsIHJldGFpbikgQ2xhc3MgX3BsYXllckxheWVyVmlld0NsYXNzOwog QHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBBVlBsYXllckxheWVyICpwbGF5ZXJMYXll cjsKKy0gKHZvaWQpYXR0YWNoUGxheWVyTGF5ZXI7CistICh2b2lkKWRldGFjaFBsYXllckxheWVy OworLSAoQVZTaW1wbGVQbGF5ZXJMYXllclZpZXcgKilfcGxheWVyTGF5ZXJWaWV3OwogQGVuZAog CiBAaW50ZXJmYWNlIEFWUGxheWVyTGF5ZXJWaWV3IDogVUlWaWV3Cg== 257249 2015-07-22 00:38:33 -0700 2015-07-22 12:25:56 -0700 Patch bug-147186-20150722003719.patch text/plain 10027 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk2ZjBhNzdjMDQzMGQy YjkyYzRlNGMyNzU0NzA4NzMzY2QwNGRkOS4uZmYwMDNhZWVhZWE4NDMwNzhiNGMzNmM2MGVlMmJh NTVlOGE5ZTMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA3LTIyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBBZG9wdCBBVktpdCdzIEFW U2ltcGxlUGxheWVyTGF5ZXJWaWV3IGNoYW5nZSBmb3IgUGlQLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTg2CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yMTkyODE3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBVlNpbXBsZVBsYXllckxheWVyVmlldyByZXBsYWNlcyBBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXcgYXMgdGhlIG93bmVyIG9mCisgICAgICAgIHRoZSBBVlBsYXllckxh eWVyIGZvciBQaVAuIFRoaXMgYWxsb3dzIHRoZSByZW1vdmFsIG9mIFdlYkFWUGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlldworICAgICAgICBhbmQgYWRkaXRpb24gb2YgV2ViQVZTaW1wbGVQ bGF5ZXJMYXllclZpZXcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgIChXZWJBVlNpbXBsZVBsYXllckxheWVyVmll d19sYXllckNsYXNzKTogQWRkZWQuCisgICAgICAgIChnZXRXZWJBVlNpbXBsZVBsYXllckxheWVy Vmlld0NsYXNzKTogQWRkZWQuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld19sYXllckNs YXNzKTogU3R5bGUuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld19wbGF5ZXJDb250cm9s bGVyKTogU3R5bGUuCisgICAgICAgIChXZWJBVlBsYXllckxheWVyVmlld192aWRlb1ZpZXcpOiBT dHlsZS4KKyAgICAgICAgKFdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0YXJ0Um91dGluZ1ZpZGVvVG9Q aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KTogYWRvcHQgLWF0dGFjaAorICAgICAgICAo V2ViQVZQbGF5ZXJMYXllclZpZXdfc3RvcFJvdXRpbmdWaWRlb1RvUGljdHVyZUluUGljdHVyZVBs YXllckxheWVyVmlldyk6IGFkb3B0IC1kZXRhY2gKKyAgICAgICAgKFdlYkFWUGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlld19sYXllckNsYXNzKTogRGVsZXRlZC4KKyAgICAgICAgKGdldFdl YkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkFWUGxheWVyTGF5ZXJWaWV3X3BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcp OiBEZWxldGVkLgorICAgICAgICAoV2ViQVZQbGF5ZXJMYXllclZpZXdfZGVhbGxvYyk6IERlbGV0 ZWQuCisgICAgICAgIChnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9zcGkvY29jb2EvQVZLaXRTUEkuaDogQWRkIGNvcnJlc29uZGluZyBB VktpdCBTUEkuCisKIDIwMTUtMDctMjEgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0NTUyBTZWxlY3RvcnMgTGV2ZWwgNF0gQWRkICNpZmRlZnMgdG8g dGhlIG5ldyAnPj4nIGRlc2NlbmRhbnQgY29tYmluYXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0Lm1tCmluZGV4IDI3NDc4ZGU2NmZjOGU0NDEyZTZiNzI2NjI5NjUzZTkwMDRjMjY4YzEuLmYy ZjI0NmFlNmUzMjY0Y2IyOGI1ZjRkZjAwZjNiNDkwMmYwZTNhMjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQubW0KQEAgLTYxLDcgKzYxLDcgQEAgU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBB VlBsYXllckNvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyVmlld0Nv bnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWVmFsdWVUaW1pbmcpCiBTT0ZUX0xJ TktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyTGF5ZXJWaWV3KQotU09GVF9MSU5LX0NMQVNTKEFWS2l0 LCBBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcpCitTT0ZUX0xJTktfQ0xBU1MoQVZL aXQsIEFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0 KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUFwcGxpY2F0aW9uKQpAQCAtNzM1LDIzICs3MzUs MjMgQEAgc3RhdGljIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpFeGl0RnVsbFNj cmVlblJlYXNvbiBjb252ZXJ0VG9FeGl0RnVsbFMKIAogQGVuZAogCi1AaW50ZXJmYWNlIFdlYkFW UGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyA6IEFWUGljdHVyZUluUGljdHVyZVBsYXll ckxheWVyVmlldworQGludGVyZmFjZSBXZWJBVlNpbXBsZVBsYXllckxheWVyVmlldyA6IEFWU2lt cGxlUGxheWVyTGF5ZXJWaWV3CiBAZW5kCiAKLXN0YXRpYyBDQUxheWVyKiBXZWJBVlBpY3R1cmVJ blBpY3R1cmVQbGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQorc3RhdGljIENBTGF5 ZXIqIFdlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MoaWQsIFNFTCkKIHsKICAg ICByZXR1cm4gW1dlYkFWUGxheWVyTGF5ZXIgY2xhc3NdOwogfQogCi1zdGF0aWMgQ2xhc3MgZ2V0 V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKQorc3RhdGljIENsYXNz IGdldFdlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKQogewogICAgIHN0YXRpYyBDbGFz cyB0aGVDbGFzcyA9IG5pbDsKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsK ICAgICBkaXNwYXRjaF9vbmNlKCZvbmNlVG9rZW4sIF57Ci0gICAgICAgIHRoZUNsYXNzID0gb2Jq Y19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdD bGFzcygpLCAiV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3IiwgMCk7CisgICAg ICAgIHRoZUNsYXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlNpbXBsZVBsYXllckxh eWVyVmlld0NsYXNzKCksICJXZWJBVlNpbXBsZVBsYXllckxheWVyVmlldyIsIDApOwogICAgICAg ICBvYmpjX3JlZ2lzdGVyQ2xhc3NQYWlyKHRoZUNsYXNzKTsKLSAgICAgICAgQ2xhc3MgbWV0YUNs YXNzID0gb2JqY19nZXRNZXRhQ2xhc3MoIldlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVy VmlldyIpOwotICAgICAgICBjbGFzc19hZGRNZXRob2QobWV0YUNsYXNzLCBAc2VsZWN0b3IobGF5 ZXJDbGFzcyksIChJTVApV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3X2xheWVy Q2xhc3MsICJAQDoiKTsKKyAgICAgICAgQ2xhc3MgbWV0YUNsYXNzID0gb2JqY19nZXRNZXRhQ2xh c3MoIldlYkFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3Iik7CisgICAgICAgIGNsYXNzX2FkZE1ldGhv ZChtZXRhQ2xhc3MsIEBzZWxlY3RvcihsYXllckNsYXNzKSwgKElNUClXZWJBVlNpbXBsZVBsYXll ckxheWVyVmlld19sYXllckNsYXNzLCAiQEA6Iik7CiAgICAgfSk7CiAgICAgCiAgICAgcmV0dXJu IHRoZUNsYXNzOwpAQCAtNzYxLDEyICs3NjEsMTIgQEAgc3RhdGljIENsYXNzIGdldFdlYkFWUGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0NsYXNzKCkKIEBwcm9wZXJ0eSAocmV0YWluKSBV SVZpZXcqIHZpZGVvVmlldzsKIEBlbmQKIAotc3RhdGljIENBTGF5ZXIqIFdlYkFWUGxheWVyTGF5 ZXJWaWV3X2xheWVyQ2xhc3MoaWQsIFNFTCkKK3N0YXRpYyBDQUxheWVyICpXZWJBVlBsYXllckxh eWVyVmlld19sYXllckNsYXNzKGlkLCBTRUwpCiB7CiAgICAgcmV0dXJuIFtXZWJBVlBsYXllckxh eWVyIGNsYXNzXTsKIH0KIAotc3RhdGljIEFWUGxheWVyQ29udHJvbGxlciogV2ViQVZQbGF5ZXJM YXllclZpZXdfcGxheWVyQ29udHJvbGxlcihpZCBhU2VsZiwgU0VMKQorc3RhdGljIEFWUGxheWVy Q29udHJvbGxlciAqV2ViQVZQbGF5ZXJMYXllclZpZXdfcGxheWVyQ29udHJvbGxlcihpZCBhU2Vs ZiwgU0VMKQogewogICAgIEFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllciA9IGFTZWxmOwog ICAgIFdlYkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXll ciAqKVtwbGF5ZXJMYXllciBwbGF5ZXJMYXllcl07CkBAIC03ODAsNyArNzgwLDcgQEAgc3RhdGlj IHZvaWQgV2ViQVZQbGF5ZXJMYXllclZpZXdfc2V0UGxheWVyQ29udHJvbGxlcihpZCBhU2VsZiwg U0VMLCBBVlBsYXllckNvbnQKICAgICBbd2ViQVZQbGF5ZXJMYXllciBzZXRQbGF5ZXJDb250cm9s bGVyOiBwbGF5ZXJDb250cm9sbGVyXTsKIH0KIAotc3RhdGljIFVJVmlldyogV2ViQVZQbGF5ZXJM YXllclZpZXdfdmlkZW9WaWV3KGlkIGFTZWxmLCBTRUwpCitzdGF0aWMgVUlWaWV3ICpXZWJBVlBs YXllckxheWVyVmlld192aWRlb1ZpZXcoaWQgYVNlbGYsIFNFTCkKIHsKICAgICBBVlBsYXllckxh eWVyVmlldyAqcGxheWVyTGF5ZXIgPSBhU2VsZjsKICAgICBXZWJBVlBsYXllckxheWVyICp3ZWJB VlBsYXllckxheWVyID0gKFdlYkFWUGxheWVyTGF5ZXIgKilbcGxheWVyTGF5ZXIgcGxheWVyTGF5 ZXJdOwpAQCAtODAyLDcgKzgwMiw5IEBAIHN0YXRpYyB2b2lkIFdlYkFWUGxheWVyTGF5ZXJWaWV3 X3N0YXJ0Um91dGluZ1ZpZGVvVG9QaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWCiB7CiAgICAg V2ViQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwogICAgIEFWUGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqcGlwVmlldyA9IFtwbGF5ZXJMYXllclZpZXcg cGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld107Ci0KKyAgICBbcGlwVmlldyBzZXRQbGF5 ZXJMYXllclZpZXdDbGFzczpnZXRXZWJBVlNpbXBsZVBsYXllckxheWVyVmlld0NsYXNzKCldOwor ICAgIAorICAgIFtwaXBWaWV3IGF0dGFjaFBsYXllckxheWVyXTsKICAgICBXZWJBVlBsYXllckxh eWVyICpwbGF5ZXJMYXllciA9IChXZWJBVlBsYXllckxheWVyICopW3BsYXllckxheWVyVmlldyBw bGF5ZXJMYXllcl07CiAgICAgV2ViQVZQbGF5ZXJMYXllciAqcGlwUGxheWVyTGF5ZXIgPSAoV2Vi QVZQbGF5ZXJMYXllciAqKVtwaXBWaWV3IHBsYXllckxheWVyXTsKICAgICBbcGxheWVyTGF5ZXIg c2V0VmlkZW9HcmF2aXR5OmdldEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QoKV07CkBA IC04MTEsMzQgKzgxMywxNCBAQCBzdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zdGFy dFJvdXRpbmdWaWRlb1RvUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVgogICAgIFtwaXBQbGF5 ZXJMYXllciBzZXRWaWRlb0dyYXZpdHk6cGxheWVyTGF5ZXIudmlkZW9HcmF2aXR5XTsKICAgICBb cGlwUGxheWVyTGF5ZXIgc2V0TW9kZWxWaWRlb0xheWVyRnJhbWU6cGxheWVyTGF5ZXIubW9kZWxW aWRlb0xheWVyRnJhbWVdOwogICAgIFtwaXBQbGF5ZXJMYXllciBzZXRQbGF5ZXJDb250cm9sbGVy OnBsYXllckxheWVyLnBsYXllckNvbnRyb2xsZXJdOwotICAgIFtwaXBWaWV3IGFkZFN1YnZpZXc6 cGxheWVyTGF5ZXJWaWV3LnZpZGVvVmlld107CisgICAgW1twaXBWaWV3IGF0dGFjaGVkUGxheWVy TGF5ZXJWaWV3XSBhZGRTdWJ2aWV3OnBsYXllckxheWVyVmlldy52aWRlb1ZpZXddOwogfQogCiBz dGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zdG9wUm91dGluZ1ZpZGVvVG9QaWN0dXJl SW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KGlkIGFTZWxmLCBTRUwpCiB7CiAgICAgV2ViQVZQbGF5 ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwogICAgIFtwbGF5ZXJMYXllclZp ZXcgYWRkU3VidmlldzpwbGF5ZXJMYXllclZpZXcudmlkZW9WaWV3XTsKLX0KLQotc3RhdGljIEFW UGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqV2ViQVZQbGF5ZXJMYXllclZpZXdfcGlj dHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyhpZCBhU2VsZiwgU0VMKQotewotICAgIFdlYkFW UGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllclZpZXcgPSBhU2VsZjsKLSAgICBXZWJBVlBpY3R1 cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcgKnBpcFZpZXcgPSBbcGxheWVyTGF5ZXJWaWV3IHZh bHVlRm9yS2V5OkAiX3BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXciXTsKLSAgICBpZiAo IXBpcFZpZXcpIHsKLSAgICAgICAgcGlwVmlldyA9IFtbZ2V0V2ViQVZQaWN0dXJlSW5QaWN0dXJl UGxheWVyTGF5ZXJWaWV3Q2xhc3MoKSBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXTsK LSAgICAgICAgW3BsYXllckxheWVyVmlldyBzZXRWYWx1ZTpwaXBWaWV3IGZvcktleTpAIl9waWN0 dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Il07Ci0gICAgfQotICAgIHJldHVybiBwaXBWaWV3 OwotfQotCi1zdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19kZWFsbG9jKGlkIGFTZWxm LCBTRUwpCi17Ci0gICAgV2ViQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFT ZWxmOwotICAgIFJldGFpblB0cjxXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXc+ IHBpcFZpZXcgPSBhZG9wdE5TKFtwbGF5ZXJMYXllclZpZXcgdmFsdWVGb3JLZXk6QCJfcGljdHVy ZUluUGljdHVyZVBsYXllckxheWVyVmlldyJdKTsKLSAgICBbcGxheWVyTGF5ZXJWaWV3IHNldFZh bHVlOm5pbCBmb3JLZXk6QCJfcGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyJdOwotICAg IG9iamNfc3VwZXIgc3VwZXJDbGFzcyB7IHBsYXllckxheWVyVmlldywgZ2V0QVZQbGF5ZXJMYXll clZpZXdDbGFzcygpIH07Ci0gICAgYXV0byBzdXBlcl9kZWFsbG9jID0gcmVpbnRlcnByZXRfY2Fz dDx2b2lkKCopKG9iamNfc3VwZXIqLCBTRUwpPihvYmpjX21zZ1NlbmRTdXBlcik7Ci0gICAgc3Vw ZXJfZGVhbGxvYygmc3VwZXJDbGFzcywgQHNlbGVjdG9yKGRlYWxsb2MpKTsKKyAgICBbW3BsYXll ckxheWVyVmlldyBwaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3XSBkZXRhY2hQbGF5ZXJM YXllcl07CiB9CiAKICNwcmFnbWEgbWFyayAtIE1ldGhvZHMKQEAgLTg0OSwxNyArODMxLDEyIEBA IHN0YXRpYyBDbGFzcyBnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKCkKICAgICBzdGF0aWMg ZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKICAgICBkaXNwYXRjaF9vbmNlKCZvbmNlVG9rZW4s IF57CiAgICAgICAgIHRoZUNsYXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihnZXRBVlBsYXll ckxheWVyVmlld0NsYXNzKCksICJXZWJBVlBsYXllckxheWVyVmlldyIsIDApOwotICAgICAgICBj bGFzc19hZGRNZXRob2QodGhlQ2xhc3MsIEBzZWxlY3RvcihkZWFsbG9jKSwgKElNUClXZWJBVlBs YXllckxheWVyVmlld19kZWFsbG9jLCAidkA6Iik7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZCh0 aGVDbGFzcywgQHNlbGVjdG9yKHNldFBsYXllckNvbnRyb2xsZXI6KSwgKElNUClXZWJBVlBsYXll ckxheWVyVmlld19zZXRQbGF5ZXJDb250cm9sbGVyLCAidkA6QCIpOwogICAgICAgICBjbGFzc19h ZGRNZXRob2QodGhlQ2xhc3MsIEBzZWxlY3RvcihwbGF5ZXJDb250cm9sbGVyKSwgKElNUClXZWJB VlBsYXllckxheWVyVmlld19wbGF5ZXJDb250cm9sbGVyLCAiQEA6Iik7CiAgICAgICAgIGNsYXNz X2FkZE1ldGhvZCh0aGVDbGFzcywgQHNlbGVjdG9yKHNldFZpZGVvVmlldzopLCAoSU1QKVdlYkFW UGxheWVyTGF5ZXJWaWV3X3NldFZpZGVvVmlldywgInZAOkAiKTsKICAgICAgICAgY2xhc3NfYWRk TWV0aG9kKHRoZUNsYXNzLCBAc2VsZWN0b3IodmlkZW9WaWV3KSwgKElNUClXZWJBVlBsYXllckxh eWVyVmlld192aWRlb1ZpZXcsICJAQDoiKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9kKHRoZUNs YXNzLCBAc2VsZWN0b3Ioc3RhcnRSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJM YXllclZpZXcpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0YXJ0Um91dGluZ1ZpZGVvVG9Q aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3LCAidkA6Iik7CiAgICAgICAgIGNsYXNzX2Fk ZE1ldGhvZCh0aGVDbGFzcywgQHNlbGVjdG9yKHN0b3BSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBp Y3R1cmVQbGF5ZXJMYXllclZpZXcpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3N0b3BSb3V0 aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcsICJ2QDoiKTsKLSAgICAg ICAgY2xhc3NfYWRkTWV0aG9kKHRoZUNsYXNzLCBAc2VsZWN0b3IocGljdHVyZUluUGljdHVyZVBs YXllckxheWVyVmlldyksIChJTVApV2ViQVZQbGF5ZXJMYXllclZpZXdfcGljdHVyZUluUGljdHVy ZVBsYXllckxheWVyVmlldywgIkBAOiIpOwotICAgICAgICAKLSAgICAgICAgY2xhc3NfYWRkSXZh cih0aGVDbGFzcywgIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Iiwgc2l6ZW9mKFdl YkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqKSwgbG9nMihzaXplb2YoV2ViQVZQ aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICopKSwgIkAiKTsKLSAgICAgICAgCiAgICAg ICAgIG9iamNfcmVnaXN0ZXJDbGFzc1BhaXIodGhlQ2xhc3MpOwogICAgICAgICBDbGFzcyBtZXRh Q2xhc3MgPSBvYmpjX2dldE1ldGFDbGFzcygiV2ViQVZQbGF5ZXJMYXllclZpZXciKTsKICAgICAg ICAgY2xhc3NfYWRkTWV0aG9kKG1ldGFDbGFzcywgQHNlbGVjdG9yKGxheWVyQ2xhc3MpLCAoSU1Q KVdlYkFWUGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MsICJAQDoiKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKaW5kZXggY2M3MTg5Yzc0NGUwOWVjMGFk MDMzYjVhZjc1OTRlMGRkNjFkNzdlNy4uNTA1ODI3ZDQ1MWY2ZWY1NDI0MDI2ZDRlNGEwZDdlMmZi NzE4ZjA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FW S2l0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJ LmgKQEAgLTYzLDggKzYzLDE2IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIEFWUGxheWVy Q29udHJvbGxlckV4dGVybmFsUGxheWJhY2tUeXBlKSB7CiAKIEBjbGFzcyBBVlBsYXllckxheWVy OwogCitAaW50ZXJmYWNlIEFWU2ltcGxlUGxheWVyTGF5ZXJWaWV3IDogVUlWaWV3CitAcHJvcGVy dHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEFWUGxheWVyTGF5ZXIgKnBsYXllckxheWVyOworQGVu ZAorCiBAaW50ZXJmYWNlIEFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyA6IFVJVmll dworQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbikgQ2xhc3MgcGxheWVyTGF5ZXJWaWV3Q2xh c3M7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEFWUGxheWVyTGF5ZXIgKnBsYXll ckxheWVyOworLSAodm9pZClhdHRhY2hQbGF5ZXJMYXllcjsKKy0gKHZvaWQpZGV0YWNoUGxheWVy TGF5ZXI7CistIChBVlNpbXBsZVBsYXllckxheWVyVmlldyAqKWF0dGFjaGVkUGxheWVyTGF5ZXJW aWV3OwogQGVuZAogCiBAaW50ZXJmYWNlIEFWUGxheWVyTGF5ZXJWaWV3IDogVUlWaWV3Cg== 257285 2015-07-22 12:25:58 -0700 2015-07-22 14:28:47 -0700 Patch bug-147186-20150722122443.patch text/plain 5312 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk2ZjBhNzdjMDQzMGQy YjkyYzRlNGMyNzU0NzA4NzMzY2QwNGRkOS4uZDU0M2ZhNmY3MDVlNzNjNGQ4MGE3N2RjZTJiYTAy ZDcwNDllNGY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTIyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBBZG9wdCBBVktpdCdzIEFW U2ltcGxlUGxheWVyTGF5ZXJWaWV3IGNoYW5nZSBmb3IgUGlQLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTg2CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yMTkyODE3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZG9wdCBBVktpdCBjaGFuZ2VzIGJ5IGluaGVyaXRpbmcgZnJvbSBVSVZpZXcgaW5z dGVhZCBvZiBmcm9tIEFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldy4KKworICAgICAg ICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAg ICAgICAgKFdlYkFWUGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MpOiBTdHlsZS4KKyAgICAgICAg KFdlYkFWUGxheWVyTGF5ZXJWaWV3X3BsYXllckNvbnRyb2xsZXIpOiBTdHlsZS4KKyAgICAgICAg KFdlYkFWUGxheWVyTGF5ZXJWaWV3X3ZpZGVvVmlldyk6IFN0eWxlLgorICAgICAgICAoZ2V0V2Vi QVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Q2xhc3MpOiBJbmhlcml0IGZyb20gVUlW aWV3LgorCiAyMDE1LTA3LTIxICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtDU1MgU2VsZWN0b3JzIExldmVsIDRdIEFkZCAjaWZkZWZzIHRvIHRoZSBu ZXcgJz4+JyBkZXNjZW5kYW50IGNvbWJpbmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5t bQppbmRleCAyNzQ3OGRlNjZmYzhlNDQxMmU2YjcyNjYyOTY1M2U5MDA0YzI2OGMxLi41NzVjNWI3 OGNjNjVkYmI2MmIxZjcyOGNiMDQ0NDRiMjEzOGJjOGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Lm1tCkBAIC02MSw3ICs2MSw2IEBAIFNPRlRfTElOS19DTEFTUyhBVktpdCwgQVZQbGF5 ZXJDb250cm9sbGVyKQogU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBBVlBsYXllclZpZXdDb250cm9s bGVyKQogU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBBVlZhbHVlVGltaW5nKQogU09GVF9MSU5LX0NM QVNTKEFWS2l0LCBBVlBsYXllckxheWVyVmlldykKLVNPRlRfTElOS19DTEFTUyhBVktpdCwgQVZQ aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJ S2l0KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUFwcGxpY2F0aW9uKQpAQCAtNzM1LDcgKzcz NCw3IEBAIHN0YXRpYyBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6RXhpdEZ1bGxT Y3JlZW5SZWFzb24gY29udmVydFRvRXhpdEZ1bGxTCiAKIEBlbmQKIAotQGludGVyZmFjZSBXZWJB VlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcgOiBBVlBpY3R1cmVJblBpY3R1cmVQbGF5 ZXJMYXllclZpZXcKK0BpbnRlcmZhY2UgV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJW aWV3IDogVUlWaWV3CiBAZW5kCiAKIHN0YXRpYyBDQUxheWVyKiBXZWJBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQpAQCAtNzQ4LDcgKzc0Nyw3IEBA IHN0YXRpYyBDbGFzcyBnZXRXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdDbGFz cygpCiAgICAgc3RhdGljIENsYXNzIHRoZUNsYXNzID0gbmlsOwogICAgIHN0YXRpYyBkaXNwYXRj aF9vbmNlX3Qgb25jZVRva2VuOwogICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKLSAg ICAgICAgdGhlQ2xhc3MgPSBvYmpjX2FsbG9jYXRlQ2xhc3NQYWlyKGdldEFWUGljdHVyZUluUGlj dHVyZVBsYXllckxheWVyVmlld0NsYXNzKCksICJXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJM YXllclZpZXciLCAwKTsKKyAgICAgICAgdGhlQ2xhc3MgPSBvYmpjX2FsbG9jYXRlQ2xhc3NQYWly KGdldFVJVmlld0NsYXNzKCksICJXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXci LCAwKTsKICAgICAgICAgb2JqY19yZWdpc3RlckNsYXNzUGFpcih0aGVDbGFzcyk7CiAgICAgICAg IENsYXNzIG1ldGFDbGFzcyA9IG9iamNfZ2V0TWV0YUNsYXNzKCJXZWJBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXciKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9kKG1ldGFDbGFzcywg QHNlbGVjdG9yKGxheWVyQ2xhc3MpLCAoSU1QKVdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxh eWVyVmlld19sYXllckNsYXNzLCAiQEA6Iik7CkBAIC03NjEsMTIgKzc2MCwxMiBAQCBzdGF0aWMg Q2xhc3MgZ2V0V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKQogQHBy b3BlcnR5IChyZXRhaW4pIFVJVmlldyogdmlkZW9WaWV3OwogQGVuZAogCi1zdGF0aWMgQ0FMYXll ciogV2ViQVZQbGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQorc3RhdGljIENBTGF5 ZXIgKldlYkFWUGxheWVyTGF5ZXJWaWV3X2xheWVyQ2xhc3MoaWQsIFNFTCkKIHsKICAgICByZXR1 cm4gW1dlYkFWUGxheWVyTGF5ZXIgY2xhc3NdOwogfQogCi1zdGF0aWMgQVZQbGF5ZXJDb250cm9s bGVyKiBXZWJBVlBsYXllckxheWVyVmlld19wbGF5ZXJDb250cm9sbGVyKGlkIGFTZWxmLCBTRUwp CitzdGF0aWMgQVZQbGF5ZXJDb250cm9sbGVyICpXZWJBVlBsYXllckxheWVyVmlld19wbGF5ZXJD b250cm9sbGVyKGlkIGFTZWxmLCBTRUwpCiB7CiAgICAgQVZQbGF5ZXJMYXllclZpZXcgKnBsYXll ckxheWVyID0gYVNlbGY7CiAgICAgV2ViQVZQbGF5ZXJMYXllciAqd2ViQVZQbGF5ZXJMYXllciA9 IChXZWJBVlBsYXllckxheWVyICopW3BsYXllckxheWVyIHBsYXllckxheWVyXTsKQEAgLTc4MCw3 ICs3NzksNyBAQCBzdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zZXRQbGF5ZXJDb250 cm9sbGVyKGlkIGFTZWxmLCBTRUwsIEFWUGxheWVyQ29udAogICAgIFt3ZWJBVlBsYXllckxheWVy IHNldFBsYXllckNvbnRyb2xsZXI6IHBsYXllckNvbnRyb2xsZXJdOwogfQogCi1zdGF0aWMgVUlW aWV3KiBXZWJBVlBsYXllckxheWVyVmlld192aWRlb1ZpZXcoaWQgYVNlbGYsIFNFTCkKK3N0YXRp YyBVSVZpZXcgKldlYkFWUGxheWVyTGF5ZXJWaWV3X3ZpZGVvVmlldyhpZCBhU2VsZiwgU0VMKQog ewogICAgIEFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllciA9IGFTZWxmOwogICAgIFdlYkFW UGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtwbGF5 ZXJMYXllciBwbGF5ZXJMYXllcl07CkBAIC04MDEsMTAgKzgwMCwxMCBAQCBzdGF0aWMgdm9pZCBX ZWJBVlBsYXllckxheWVyVmlld19zZXRWaWRlb1ZpZXcoaWQgYVNlbGYsIFNFTCwgVUlWaWV3ICp2 aWRlb1ZpZXcpCiBzdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zdGFydFJvdXRpbmdW aWRlb1RvUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyhpZCBhU2VsZiwgU0VMKQogewog ICAgIFdlYkFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllclZpZXcgPSBhU2VsZjsKLSAgICBB VlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXcgKnBpcFZpZXcgPSBbcGxheWVyTGF5ZXJW aWV3IHBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXddOworICAgIFdlYkFWUGljdHVyZUlu UGljdHVyZVBsYXllckxheWVyVmlldyAqcGlwVmlldyA9IChXZWJBVlBpY3R1cmVJblBpY3R1cmVQ bGF5ZXJMYXllclZpZXcgKilbcGxheWVyTGF5ZXJWaWV3IHBpY3R1cmVJblBpY3R1cmVQbGF5ZXJM YXllclZpZXddOwogCiAgICAgV2ViQVZQbGF5ZXJMYXllciAqcGxheWVyTGF5ZXIgPSAoV2ViQVZQ bGF5ZXJMYXllciAqKVtwbGF5ZXJMYXllclZpZXcgcGxheWVyTGF5ZXJdOwotICAgIFdlYkFWUGxh eWVyTGF5ZXIgKnBpcFBsYXllckxheWVyID0gKFdlYkFWUGxheWVyTGF5ZXIgKilbcGlwVmlldyBw bGF5ZXJMYXllcl07CisgICAgV2ViQVZQbGF5ZXJMYXllciAqcGlwUGxheWVyTGF5ZXIgPSAoV2Vi QVZQbGF5ZXJMYXllciAqKVtwaXBWaWV3IGxheWVyXTsKICAgICBbcGxheWVyTGF5ZXIgc2V0Vmlk ZW9HcmF2aXR5OmdldEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QoKV07CiAgICAgW3Bp cFBsYXllckxheWVyIHNldFZpZGVvU3VibGF5ZXI6cGxheWVyTGF5ZXIudmlkZW9TdWJsYXllcl07 CiAgICAgW3BpcFBsYXllckxheWVyIHNldFZpZGVvRGltZW5zaW9uczpwbGF5ZXJMYXllci52aWRl b0RpbWVuc2lvbnNdOwpAQCAtODIwLDcgKzgxOSw3IEBAIHN0YXRpYyB2b2lkIFdlYkFWUGxheWVy TGF5ZXJWaWV3X3N0b3BSb3V0aW5nVmlkZW9Ub1BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZp CiAgICAgW3BsYXllckxheWVyVmlldyBhZGRTdWJ2aWV3OnBsYXllckxheWVyVmlldy52aWRlb1Zp ZXddOwogfQogCi1zdGF0aWMgQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICpXZWJB VlBsYXllckxheWVyVmlld19waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KGlkIGFTZWxm LCBTRUwpCitzdGF0aWMgV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICpXZWJB VlBsYXllckxheWVyVmlld19waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3KGlkIGFTZWxm LCBTRUwpCiB7CiAgICAgV2ViQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFT ZWxmOwogICAgIFdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyAqcGlwVmlldyA9 IFtwbGF5ZXJMYXllclZpZXcgdmFsdWVGb3JLZXk6QCJfcGljdHVyZUluUGljdHVyZVBsYXllckxh eWVyVmlldyJdOwo=