147399 2015-07-28 21:32:17 -0700 Rename AVPlayerLayerView to _AVPlayerLayerView. 2015-08-02 12:32:16 -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 oldest_to_newest 1113027 0 jeremyj-wk 2015-07-28 21:32:17 -0700 Rename AVPlayerLayerView to _AVPlayerLayerView. 1113032 1 jeremyj-wk 2015-07-28 21:46:28 -0700 rdar://problem/22000865 1113761 2 257934 jeremyj-wk 2015-07-31 11:18:37 -0700 Created attachment 257934 Patch 1113762 3 jeremyj-wk 2015-07-31 11:19:13 -0700 Actually rename it to __AVPlayerLayerView 1113764 4 257935 jeremyj-wk 2015-07-31 11:24:39 -0700 Created attachment 257935 Patch 1113837 5 257935 eric.carlson 2015-07-31 14:01:48 -0700 Comment on attachment 257935 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257935&action=review > Source/WebCore/ChangeLog:3 > + Rename AVPlayerLayerView to _AVPlayerLayerView. Nit: you added two underscores to the name - "__AVPlayerLayerView" 1113867 6 jeremyj-wk 2015-07-31 14:48:07 -0700 (In reply to comment #5) > Comment on attachment 257935 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257935&action=review > > > Source/WebCore/ChangeLog:3 > > + Rename AVPlayerLayerView to _AVPlayerLayerView. > > Nit: you added two underscores to the name - "__AVPlayerLayerView" Intentional. That is the actual name AVKit decided on. 1113890 7 257935 commit-queue 2015-07-31 15:20:38 -0700 Comment on attachment 257935 Patch Clearing flags on attachment: 257935 Committed r187684: <http://trac.webkit.org/changeset/187684> 1113891 8 commit-queue 2015-07-31 15:20:42 -0700 All reviewed patches have been landed. Closing bug. 1114028 9 eric.carlson 2015-08-01 09:05:53 -0700 (In reply to comment #6) > (In reply to comment #5) > > Comment on attachment 257935 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=257935&action=review > > > > > Source/WebCore/ChangeLog:3 > > > + Rename AVPlayerLayerView to _AVPlayerLayerView. > > > > Nit: you added two underscores to the name - "__AVPlayerLayerView" > > Intentional. That is the actual name AVKit decided on. Yes, but the comment in the change log only has a single underscore. 257934 2015-07-31 11:18:37 -0700 2015-07-31 11:24:35 -0700 Patch bug-147399-20150731111836.patch text/plain 6035 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5Yzg3Nzk5M2RlMDM4 NDQ1ZWEzNmFjZTMxNWU5YjcxNjU0MjhhMi4uMTc2OTZiZjI2MjcwNTUyYmQ2MGUwMDEyOTk0ZDJm NzYwZDMwNTk4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgQVZQbGF5ZXJM YXllclZpZXcgdG8gX0FWUGxheWVyTGF5ZXJWaWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Mzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIGNsYXNzIG5hbWUgQVZQbGF5ZXJMYXllclZp ZXcgdG8gbWF0Y2ggY2hhbmdlIGluIEFWS2l0IFNQSS4gCisgICAgICAgIFRoaXMgcHJldmVudHMg Y29uZmxpY3RzIHdpdGggM3JkIHBhcnR5IGFwcHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgIChXZWJBVlBsYXll ckxheWVyVmlld19kZWFsbG9jKToKKyAgICAgICAgKGdldFdlYkFWUGxheWVyTGF5ZXJWaWV3Q2xh c3MpOgorICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oOgorCiAyMDE1LTA3 LTI4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBkZWJ1ZyBidWlsZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggMzUyYWE3 ZjYwYzc1YzE1NzA3Nzk5NjgzYjlhZjRhZmJhNjI5ZTE5My4uOTc4MzAyY2ZlMDU0MGNjZmM4NWNl NWM3MzdhM2IyZGNkZGJjNTY4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAt NjAsNyArNjAsNyBAQCBTT0ZUX0xJTktfRlJBTUVXT1JLKEFWS2l0KQogU09GVF9MSU5LX0NMQVNT KEFWS2l0LCBBVlBsYXllckNvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWUGxh eWVyVmlld0NvbnRyb2xsZXIpCiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWVmFsdWVUaW1pbmcp Ci1TT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyTGF5ZXJWaWV3KQorU09GVF9MSU5LX0NM QVNTKEFWS2l0LCBfX0FWUGxheWVyTGF5ZXJWaWV3KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJ S2l0KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUFwcGxpY2F0aW9uKQpAQCAtNzU4LDcgKzc1 OCw3IEBAIHN0YXRpYyBDbGFzcyBnZXRXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZp ZXdDbGFzcygpCiAgICAgcmV0dXJuIHRoZUNsYXNzOwogfQogCi1AaW50ZXJmYWNlIFdlYkFWUGxh eWVyTGF5ZXJWaWV3IDogQVZQbGF5ZXJMYXllclZpZXcKK0BpbnRlcmZhY2UgV2ViQVZQbGF5ZXJM YXllclZpZXcgOiBfX0FWUGxheWVyTGF5ZXJWaWV3CiBAcHJvcGVydHkgKHJldGFpbikgVUlWaWV3 KiB2aWRlb1ZpZXc7CiBAZW5kCiAKQEAgLTc2OSwyMSArNzY5LDIxIEBAIHN0YXRpYyBDQUxheWVy ICpXZWJBVlBsYXllckxheWVyVmlld19sYXllckNsYXNzKGlkLCBTRUwpCiAKIHN0YXRpYyBBVlBs YXllckNvbnRyb2xsZXIgKldlYkFWUGxheWVyTGF5ZXJWaWV3X3BsYXllckNvbnRyb2xsZXIoaWQg YVNlbGYsIFNFTCkKIHsKLSAgICBBVlBsYXllckxheWVyVmlldyAqcGxheWVyTGF5ZXIgPSBhU2Vs ZjsKKyAgICBfX0FWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllciA9IGFTZWxmOwogICAgIFdl YkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtw bGF5ZXJMYXllciBwbGF5ZXJMYXllcl07CiAgICAgcmV0dXJuIFt3ZWJBVlBsYXllckxheWVyIHBs YXllckNvbnRyb2xsZXJdOwogfQogCiBzdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19z ZXRQbGF5ZXJDb250cm9sbGVyKGlkIGFTZWxmLCBTRUwsIEFWUGxheWVyQ29udHJvbGxlciAqcGxh eWVyQ29udHJvbGxlcikKIHsKLSAgICBBVlBsYXllckxheWVyVmlldyAqcGxheWVyTGF5ZXJWaWV3 ID0gYVNlbGY7CisgICAgX19BVlBsYXllckxheWVyVmlldyAqcGxheWVyTGF5ZXJWaWV3ID0gYVNl bGY7CiAgICAgV2ViQVZQbGF5ZXJMYXllciAqd2ViQVZQbGF5ZXJMYXllciA9IChXZWJBVlBsYXll ckxheWVyICopW3BsYXllckxheWVyVmlldyBwbGF5ZXJMYXllcl07CiAgICAgW3dlYkFWUGxheWVy TGF5ZXIgc2V0UGxheWVyQ29udHJvbGxlcjogcGxheWVyQ29udHJvbGxlcl07CiB9CiAKIHN0YXRp YyBVSVZpZXcgKldlYkFWUGxheWVyTGF5ZXJWaWV3X3ZpZGVvVmlldyhpZCBhU2VsZiwgU0VMKQog ewotICAgIEFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5ZXJMYXllciA9IGFTZWxmOworICAgIF9fQVZQ bGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyID0gYVNlbGY7CiAgICAgV2ViQVZQbGF5ZXJMYXll ciAqd2ViQVZQbGF5ZXJMYXllciA9IChXZWJBVlBsYXllckxheWVyICopW3BsYXllckxheWVyIHBs YXllckxheWVyXTsKICAgICBDQUxheWVyKiB2aWRlb0xheWVyID0gW3dlYkFWUGxheWVyTGF5ZXIg dmlkZW9TdWJsYXllcl07CiAgICAgaWYgKCF2aWRlb0xheWVyKQpAQCAtNzk0LDcgKzc5NCw3IEBA IHN0YXRpYyBVSVZpZXcgKldlYkFWUGxheWVyTGF5ZXJWaWV3X3ZpZGVvVmlldyhpZCBhU2VsZiwg U0VMKQogCiBzdGF0aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zZXRWaWRlb1ZpZXcoaWQg YVNlbGYsIFNFTCwgVUlWaWV3ICp2aWRlb1ZpZXcpCiB7Ci0gICAgQVZQbGF5ZXJMYXllclZpZXcg KnBsYXllckxheWVyVmlldyA9IGFTZWxmOworICAgIF9fQVZQbGF5ZXJMYXllclZpZXcgKnBsYXll ckxheWVyVmlldyA9IGFTZWxmOwogICAgIFdlYkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5 ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtwbGF5ZXJMYXllclZpZXcgcGxheWVyTGF5ZXJdOwog ICAgIFt3ZWJBVlBsYXllckxheWVyIHNldFZpZGVvU3VibGF5ZXI6W3ZpZGVvVmlldyBsYXllcl1d OwogfQpAQCAtODM3LDcgKzgzNyw3IEBAIHN0YXRpYyB2b2lkIFdlYkFWUGxheWVyTGF5ZXJWaWV3 X2RlYWxsb2MoaWQgYVNlbGYsIFNFTCkKICAgICBXZWJBVlBsYXllckxheWVyVmlldyAqcGxheWVy TGF5ZXJWaWV3ID0gYVNlbGY7CiAgICAgUmV0YWluUHRyPFdlYkFWUGljdHVyZUluUGljdHVyZVBs YXllckxheWVyVmlldz4gcGlwVmlldyA9IGFkb3B0TlMoW3BsYXllckxheWVyVmlldyB2YWx1ZUZv cktleTpAIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Il0pOwogICAgIFtwbGF5ZXJM YXllclZpZXcgc2V0VmFsdWU6bmlsIGZvcktleTpAIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5 ZXJWaWV3Il07Ci0gICAgb2JqY19zdXBlciBzdXBlckNsYXNzIHsgcGxheWVyTGF5ZXJWaWV3LCBn ZXRBVlBsYXllckxheWVyVmlld0NsYXNzKCkgfTsKKyAgICBvYmpjX3N1cGVyIHN1cGVyQ2xhc3Mg eyBwbGF5ZXJMYXllclZpZXcsIGdldF9fQVZQbGF5ZXJMYXllclZpZXdDbGFzcygpIH07CiAgICAg YXV0byBzdXBlcl9kZWFsbG9jID0gcmVpbnRlcnByZXRfY2FzdDx2b2lkKCopKG9iamNfc3VwZXIq LCBTRUwpPihvYmpjX21zZ1NlbmRTdXBlcik7CiAgICAgc3VwZXJfZGVhbGxvYygmc3VwZXJDbGFz cywgQHNlbGVjdG9yKGRlYWxsb2MpKTsKIH0KQEAgLTg0OSw3ICs4NDksNyBAQCBzdGF0aWMgQ2xh c3MgZ2V0V2ViQVZQbGF5ZXJMYXllclZpZXdDbGFzcygpCiAgICAgc3RhdGljIENsYXNzIHRoZUNs YXNzID0gbmlsOwogICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOwogICAgIGRp c3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKLSAgICAgICAgdGhlQ2xhc3MgPSBvYmpjX2FsbG9j YXRlQ2xhc3NQYWlyKGdldEFWUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKSwgIldlYkFWUGxheWVyTGF5 ZXJWaWV3IiwgMCk7CisgICAgICAgIHRoZUNsYXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihn ZXRfX0FWUGxheWVyTGF5ZXJWaWV3Q2xhc3MoKSwgIldlYkFWUGxheWVyTGF5ZXJWaWV3IiwgMCk7 CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZCh0aGVDbGFzcywgQHNlbGVjdG9yKGRlYWxsb2MpLCAo SU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X2RlYWxsb2MsICJ2QDoiKTsKICAgICAgICAgY2xhc3Nf YWRkTWV0aG9kKHRoZUNsYXNzLCBAc2VsZWN0b3Ioc2V0UGxheWVyQ29udHJvbGxlcjopLCAoSU1Q KVdlYkFWUGxheWVyTGF5ZXJWaWV3X3NldFBsYXllckNvbnRyb2xsZXIsICJ2QDpAIik7CiAgICAg ICAgIGNsYXNzX2FkZE1ldGhvZCh0aGVDbGFzcywgQHNlbGVjdG9yKHBsYXllckNvbnRyb2xsZXIp LCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3BsYXllckNvbnRyb2xsZXIsICJAQDoiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKaW5kZXggY2M3MTg5 Yzc0NGUwOWVjMGFkMDMzYjVhZjc1OTRlMGRkNjFkNzdlNy4uNGJhYjRiOTY4ODMzODY3ZTYzYTcz OGQ0ODU0YjNhOGI0OTI1MDllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v c3BpL2NvY29hL0FWS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2Nv Y29hL0FWS2l0U1BJLmgKQEAgLTY3LDcgKzY3LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdl ciwgQVZQbGF5ZXJDb250cm9sbGVyRXh0ZXJuYWxQbGF5YmFja1R5cGUpIHsKIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCByZWFkb25seSkgQVZQbGF5ZXJMYXllciAqcGxheWVyTGF5ZXI7CiBAZW5kCiAK LUBpbnRlcmZhY2UgQVZQbGF5ZXJMYXllclZpZXcgOiBVSVZpZXcKK0BpbnRlcmZhY2UgX19BVlBs YXllckxheWVyVmlldyA6IFVJVmlldwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBB VlBsYXllckxheWVyICpwbGF5ZXJMYXllcjsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25s eSkgQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICpwaWN0dXJlSW5QaWN0dXJlUGxh eWVyTGF5ZXJWaWV3OwogLSAodm9pZClzdGFydFJvdXRpbmdWaWRlb1RvUGljdHVyZUluUGljdHVy ZVBsYXllckxheWVyVmlldzsKQEAgLTg4LDcgKzg4LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50 ZWdlciwgQVZQbGF5ZXJWaWV3Q29udHJvbGxlckV4aXRGdWxsU2NyZWVuUmVhc29uKSB7CiBAZW5k CiAKIEBpbnRlcmZhY2UgQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAoRGV0YWlscykKLS0gKGluc3Rh bmNldHlwZSlpbml0V2l0aFBsYXllckxheWVyVmlldzooQVZQbGF5ZXJMYXllclZpZXcgKilwbGF5 ZXJMYXllclZpZXc7CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQbGF5ZXJMYXllclZpZXc6KF9f QVZQbGF5ZXJMYXllclZpZXcgKilwbGF5ZXJMYXllclZpZXc7CiAtICh2b2lkKWVudGVyRnVsbFNj cmVlbkFuaW1hdGVkOihCT09MKWFuaW1hdGVkIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShC T09MIHN1Y2Nlc3MsIE5TRXJyb3IgKikpY29tcGxldGlvbkhhbmRsZXI7CiAtICh2b2lkKWV4aXRG dWxsU2NyZWVuQW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQg KF4pKEJPT0wgc3VjY2VzcywgTlNFcnJvciAqKSljb21wbGV0aW9uSGFuZGxlcjsKIAo= 257935 2015-07-31 11:24:39 -0700 2015-07-31 15:20:38 -0700 Patch bug-147399-20150731112438.patch text/plain 6058 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDUzMzkwZGI0OTRjMzc3 NGZmZDU0OTkwY2IwMmE1NjJkY2U4ZGNkMC4uYjJlMjc1NGVjZjY0N2Y2NmY5YWVlMGU4N2UyMGE5 NmRiYmQzYWFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgQVZQbGF5ZXJM YXllclZpZXcgdG8gX0FWUGxheWVyTGF5ZXJWaWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Mzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIGNsYXNzIG5hbWUgQVZQbGF5ZXJMYXllclZp ZXcgdG8gbWF0Y2ggY2hhbmdlIGluIEFWS2l0IFNQSS4gCisgICAgICAgIFRoaXMgcHJldmVudHMg Y29uZmxpY3RzIHdpdGggM3JkIHBhcnR5IGFwcHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgIChXZWJBVlBsYXll ckxheWVyVmlld19kZWFsbG9jKToKKyAgICAgICAgKGdldFdlYkFWUGxheWVyTGF5ZXJWaWV3Q2xh c3MpOgorICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oOgorCiAyMDE1LTA3 LTMxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUHJlcGFyZSBmb3IgZGVidWcgQ01ha2UgYnVpbGRzIG9uIFdpbmRvd3MuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQubW0KaW5kZXggOGEzYmZjY2I3ODM0ZTU0N2QxMDVmMDc0YTMxYmQyNzY0 ZDkzM2RhNS4uMmFjNGMzNjczNDBmYjc5NDA2MWI2ZGM4OGUyMjkwZmEwYTAyMjZjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtNjAsNyArNjAsNyBAQCBTT0ZUX0xJTktfRlJB TUVXT1JLKEFWS2l0KQogU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBBVlBsYXllckNvbnRyb2xsZXIp CiBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFWUGxheWVyVmlld0NvbnRyb2xsZXIpCiBTT0ZUX0xJ TktfQ0xBU1MoQVZLaXQsIEFWVmFsdWVUaW1pbmcpCi1TT0ZUX0xJTktfQ0xBU1MoQVZLaXQsIEFW UGxheWVyTGF5ZXJWaWV3KQorU09GVF9MSU5LX0NMQVNTKEFWS2l0LCBfX0FWUGxheWVyTGF5ZXJW aWV3KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0 LCBVSUFwcGxpY2F0aW9uKQpAQCAtNzU5LDcgKzc1OSw3IEBAIHN0YXRpYyBDbGFzcyBnZXRXZWJB VlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdDbGFzcygpCiAgICAgcmV0dXJuIHRoZUNs YXNzOwogfQogCi1AaW50ZXJmYWNlIFdlYkFWUGxheWVyTGF5ZXJWaWV3IDogQVZQbGF5ZXJMYXll clZpZXcKK0BpbnRlcmZhY2UgV2ViQVZQbGF5ZXJMYXllclZpZXcgOiBfX0FWUGxheWVyTGF5ZXJW aWV3CiBAcHJvcGVydHkgKHJldGFpbikgVUlWaWV3KiB2aWRlb1ZpZXc7CiBAZW5kCiAKQEAgLTc3 MCwyMSArNzcwLDIxIEBAIHN0YXRpYyBDQUxheWVyICpXZWJBVlBsYXllckxheWVyVmlld19sYXll ckNsYXNzKGlkLCBTRUwpCiAKIHN0YXRpYyBBVlBsYXllckNvbnRyb2xsZXIgKldlYkFWUGxheWVy TGF5ZXJWaWV3X3BsYXllckNvbnRyb2xsZXIoaWQgYVNlbGYsIFNFTCkKIHsKLSAgICBBVlBsYXll ckxheWVyVmlldyAqcGxheWVyTGF5ZXIgPSBhU2VsZjsKKyAgICBfX0FWUGxheWVyTGF5ZXJWaWV3 ICpwbGF5ZXJMYXllciA9IGFTZWxmOwogICAgIFdlYkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVy TGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtwbGF5ZXJMYXllciBwbGF5ZXJMYXllcl07CiAg ICAgcmV0dXJuIFt3ZWJBVlBsYXllckxheWVyIHBsYXllckNvbnRyb2xsZXJdOwogfQogCiBzdGF0 aWMgdm9pZCBXZWJBVlBsYXllckxheWVyVmlld19zZXRQbGF5ZXJDb250cm9sbGVyKGlkIGFTZWxm LCBTRUwsIEFWUGxheWVyQ29udHJvbGxlciAqcGxheWVyQ29udHJvbGxlcikKIHsKLSAgICBBVlBs YXllckxheWVyVmlldyAqcGxheWVyTGF5ZXJWaWV3ID0gYVNlbGY7CisgICAgX19BVlBsYXllckxh eWVyVmlldyAqcGxheWVyTGF5ZXJWaWV3ID0gYVNlbGY7CiAgICAgV2ViQVZQbGF5ZXJMYXllciAq d2ViQVZQbGF5ZXJMYXllciA9IChXZWJBVlBsYXllckxheWVyICopW3BsYXllckxheWVyVmlldyBw bGF5ZXJMYXllcl07CiAgICAgW3dlYkFWUGxheWVyTGF5ZXIgc2V0UGxheWVyQ29udHJvbGxlcjog cGxheWVyQ29udHJvbGxlcl07CiB9CiAKIHN0YXRpYyBVSVZpZXcgKldlYkFWUGxheWVyTGF5ZXJW aWV3X3ZpZGVvVmlldyhpZCBhU2VsZiwgU0VMKQogewotICAgIEFWUGxheWVyTGF5ZXJWaWV3ICpw bGF5ZXJMYXllciA9IGFTZWxmOworICAgIF9fQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVy ID0gYVNlbGY7CiAgICAgV2ViQVZQbGF5ZXJMYXllciAqd2ViQVZQbGF5ZXJMYXllciA9IChXZWJB VlBsYXllckxheWVyICopW3BsYXllckxheWVyIHBsYXllckxheWVyXTsKICAgICBDQUxheWVyKiB2 aWRlb0xheWVyID0gW3dlYkFWUGxheWVyTGF5ZXIgdmlkZW9TdWJsYXllcl07CiAgICAgaWYgKCF2 aWRlb0xheWVyKQpAQCAtNzk1LDcgKzc5NSw3IEBAIHN0YXRpYyBVSVZpZXcgKldlYkFWUGxheWVy TGF5ZXJWaWV3X3ZpZGVvVmlldyhpZCBhU2VsZiwgU0VMKQogCiBzdGF0aWMgdm9pZCBXZWJBVlBs YXllckxheWVyVmlld19zZXRWaWRlb1ZpZXcoaWQgYVNlbGYsIFNFTCwgVUlWaWV3ICp2aWRlb1Zp ZXcpCiB7Ci0gICAgQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwor ICAgIF9fQVZQbGF5ZXJMYXllclZpZXcgKnBsYXllckxheWVyVmlldyA9IGFTZWxmOwogICAgIFdl YkFWUGxheWVyTGF5ZXIgKndlYkFWUGxheWVyTGF5ZXIgPSAoV2ViQVZQbGF5ZXJMYXllciAqKVtw bGF5ZXJMYXllclZpZXcgcGxheWVyTGF5ZXJdOwogICAgIFt3ZWJBVlBsYXllckxheWVyIHNldFZp ZGVvU3VibGF5ZXI6W3ZpZGVvVmlldyBsYXllcl1dOwogfQpAQCAtODM4LDcgKzgzOCw3IEBAIHN0 YXRpYyB2b2lkIFdlYkFWUGxheWVyTGF5ZXJWaWV3X2RlYWxsb2MoaWQgYVNlbGYsIFNFTCkKICAg ICBXZWJBVlBsYXllckxheWVyVmlldyAqcGxheWVyTGF5ZXJWaWV3ID0gYVNlbGY7CiAgICAgUmV0 YWluUHRyPFdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldz4gcGlwVmlldyA9IGFk b3B0TlMoW3BsYXllckxheWVyVmlldyB2YWx1ZUZvcktleTpAIl9waWN0dXJlSW5QaWN0dXJlUGxh eWVyTGF5ZXJWaWV3Il0pOwogICAgIFtwbGF5ZXJMYXllclZpZXcgc2V0VmFsdWU6bmlsIGZvcktl eTpAIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Il07Ci0gICAgb2JqY19zdXBlciBz dXBlckNsYXNzIHsgcGxheWVyTGF5ZXJWaWV3LCBnZXRBVlBsYXllckxheWVyVmlld0NsYXNzKCkg fTsKKyAgICBvYmpjX3N1cGVyIHN1cGVyQ2xhc3MgeyBwbGF5ZXJMYXllclZpZXcsIGdldF9fQVZQ bGF5ZXJMYXllclZpZXdDbGFzcygpIH07CiAgICAgYXV0byBzdXBlcl9kZWFsbG9jID0gcmVpbnRl cnByZXRfY2FzdDx2b2lkKCopKG9iamNfc3VwZXIqLCBTRUwpPihvYmpjX21zZ1NlbmRTdXBlcik7 CiAgICAgc3VwZXJfZGVhbGxvYygmc3VwZXJDbGFzcywgQHNlbGVjdG9yKGRlYWxsb2MpKTsKIH0K QEAgLTg1MCw3ICs4NTAsNyBAQCBzdGF0aWMgQ2xhc3MgZ2V0V2ViQVZQbGF5ZXJMYXllclZpZXdD bGFzcygpCiAgICAgc3RhdGljIENsYXNzIHRoZUNsYXNzID0gbmlsOwogICAgIHN0YXRpYyBkaXNw YXRjaF9vbmNlX3Qgb25jZVRva2VuOwogICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsK LSAgICAgICAgdGhlQ2xhc3MgPSBvYmpjX2FsbG9jYXRlQ2xhc3NQYWlyKGdldEFWUGxheWVyTGF5 ZXJWaWV3Q2xhc3MoKSwgIldlYkFWUGxheWVyTGF5ZXJWaWV3IiwgMCk7CisgICAgICAgIHRoZUNs YXNzID0gb2JqY19hbGxvY2F0ZUNsYXNzUGFpcihnZXRfX0FWUGxheWVyTGF5ZXJWaWV3Q2xhc3Mo KSwgIldlYkFWUGxheWVyTGF5ZXJWaWV3IiwgMCk7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZCh0 aGVDbGFzcywgQHNlbGVjdG9yKGRlYWxsb2MpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X2Rl YWxsb2MsICJ2QDoiKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9kKHRoZUNsYXNzLCBAc2VsZWN0 b3Ioc2V0UGxheWVyQ29udHJvbGxlcjopLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3X3NldFBs YXllckNvbnRyb2xsZXIsICJ2QDpAIik7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZCh0aGVDbGFz cywgQHNlbGVjdG9yKHBsYXllckNvbnRyb2xsZXIpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJWaWV3 X3BsYXllckNvbnRyb2xsZXIsICJAQDoiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3Bp L2NvY29hL0FWS2l0U1BJLmgKaW5kZXggNmE1NGUwOTljYTdiNWJhMjU1MWFlZTA3ZTg2OGMwNWJh OWVkY2JmNy4uNjRiOTk0YWU0ZWIwZWU2YjNiYzQwNGFiOTZhNTFiYWEzNjA5YWJhZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKQEAgLTY3LDcgKzY3 LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgQVZQbGF5ZXJDb250cm9sbGVyRXh0ZXJu YWxQbGF5YmFja1R5cGUpIHsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQVZQbGF5 ZXJMYXllciAqcGxheWVyTGF5ZXI7CiBAZW5kCiAKLUBpbnRlcmZhY2UgQVZQbGF5ZXJMYXllclZp ZXcgOiBVSVZpZXcKK0BpbnRlcmZhY2UgX19BVlBsYXllckxheWVyVmlldyA6IFVJVmlldwogQHBy b3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBBVlBsYXllckxheWVyICpwbGF5ZXJMYXllcjsK IEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVy TGF5ZXJWaWV3ICpwaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3OwogLSAodm9pZClzdGFy dFJvdXRpbmdWaWRlb1RvUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldzsKQEAgLTg4LDcg Kzg4LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgQVZQbGF5ZXJWaWV3Q29udHJvbGxl ckV4aXRGdWxsU2NyZWVuUmVhc29uKSB7CiBAZW5kCiAKIEBpbnRlcmZhY2UgQVZQbGF5ZXJWaWV3 Q29udHJvbGxlciAoKQotLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGxheWVyTGF5ZXJWaWV3OihB VlBsYXllckxheWVyVmlldyAqKXBsYXllckxheWVyVmlldzsKKy0gKGluc3RhbmNldHlwZSlpbml0 V2l0aFBsYXllckxheWVyVmlldzooX19BVlBsYXllckxheWVyVmlldyAqKXBsYXllckxheWVyVmll dzsKIC0gKHZvaWQpZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQgY29tcGxl dGlvbkhhbmRsZXI6KHZvaWQgKF4pKEJPT0wgc3VjY2VzcywgTlNFcnJvciAqKSljb21wbGV0aW9u SGFuZGxlcjsKIC0gKHZvaWQpZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDooQk9PTClhbmltYXRlZCBj b21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQk9PTCBzdWNjZXNzLCBOU0Vycm9yICopKWNvbXBs ZXRpb25IYW5kbGVyOwogCg==