132603 2014-05-06 02:06:21 -0700 [iOS] Animate AVPlayerLayer into and out of full screen 2014-05-06 16:36:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn jeremyj-wk philipj sergio simon.fraser oldest_to_newest 1006896 0 jer.noble 2014-05-06 02:06:21 -0700 [iOS] Animate AVPlayerLayer into and out of full screen 1006897 1 230893 jer.noble 2014-05-06 02:10:34 -0700 Created attachment 230893 Patch 1006898 2 jer.noble 2014-05-06 02:11:14 -0700 <rdar://problem/16778157> 1007046 3 230893 simon.fraser 2014-05-06 12:39:46 -0700 Comment on attachment 230893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230893&action=review > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:354 > +- (id)init instancetype? > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:359 > + self.masksToBounds = YES; > + self.videoLayerGravity = AVVideoLayerGravityResizeAspect; Shouldn't use property syntax in the init method. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:380 > +static FloatRect largestRectWithAspectRatioInsideRect(float aspectRatio, FloatRect rect) > +{ > + if (aspectRatio > rect.size().aspectRatio()) { > + float dy = rect.width() / aspectRatio - rect.height(); > + rect.inflateY(dy / 2); > + } else { > + float dx = rect.height() * aspectRatio - rect.width(); > + rect.inflateX(dx / 2); > + } > + return rect; > +} Pretty sure we have code elsewhere that does aspect-ratio sizing. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:392 > + FloatRect rootBounds; > + CALayer *parent = self; > + while ((parent = [parent superlayer])) > + rootBounds = [parent bounds]; This is weird. How do you know how far up you're walking? Which rect do you actually want? 1007063 4 jer.noble 2014-05-06 13:21:32 -0700 (In reply to comment #3) > (From update of attachment 230893 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230893&action=review > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:354 > > +- (id)init > > instancetype? Changed. > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:359 > > + self.masksToBounds = YES; > > + self.videoLayerGravity = AVVideoLayerGravityResizeAspect; > > Shouldn't use property syntax in the init method. Changed. > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:380 > > +static FloatRect largestRectWithAspectRatioInsideRect(float aspectRatio, FloatRect rect) > > +{ > > + if (aspectRatio > rect.size().aspectRatio()) { > > + float dy = rect.width() / aspectRatio - rect.height(); > > + rect.inflateY(dy / 2); > > + } else { > > + float dx = rect.height() * aspectRatio - rect.width(); > > + rect.inflateX(dx / 2); > > + } > > + return rect; > > +} > > Pretty sure we have code elsewhere that does aspect-ratio sizing. We do (in RenderReplaced), but it's not generic. I'll add this to GeometryUtils.h. > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:392 > > + FloatRect rootBounds; > > + CALayer *parent = self; > > + while ((parent = [parent superlayer])) > > + rootBounds = [parent bounds]; > > This is weird. How do you know how far up you're walking? Which rect do you actually want? We're looking for our window's root UIViewController's view's bounds. I'll change this to pass in the view controller, and query it directly. 1007080 5 230931 jer.noble 2014-05-06 14:16:52 -0700 Created attachment 230931 Patch for landing. 1007126 6 jer.noble 2014-05-06 16:36:49 -0700 Committed r168392: <http://trac.webkit.org/changeset/168392> 230893 2014-05-06 02:10:34 -0700 2014-05-06 12:39:46 -0700 Patch bug-132603-20140506021025.patch text/plain 5160 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE0ZGUzYjBkMzQzZmEz YzdhYTFhMDkzOTk3ZjE3ZmZiZjI0ODdlYy4uNTdiYzU2Y2Y2ZGNhNDMxMWViNjNjZjJhY2FlMzA3 N2NhMzc2ZjBkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFuaW1hdGUgQVZQ bGF5ZXJMYXllciBpbnRvIGFuZCBvdXQgb2YgZnVsbCBzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjYwMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIHN5bmNocm9uaXplIGFu aW1hdGlvbnMgYWNyb3NzIHRoZSBXZWJQcm9jZXNzIC8gVUlQcm9jZXNzIGJvdW5kYXJ5LCBhbmlt YXRlCisgICAgICAgIHRoZSBBVlBsYXllckxheWVyIGludG8gcGxhY2UgYnkgZmlyc3QgcmVzaXpp bmcgdGhlIGZ1bGwgc2NyZWVuIGxheWVyIHRvIG9jY3VweSB0aGUKKyAgICAgICAgZW50aXJlIHNj cmVlbiBpbiB0aGUgV2ViUHJvY2VzcywgYW5kIHVzZSBhIHN1YmxheWVyVHJhbnNmb3JtIGFuaW1h dGlvbiBpbiB0aGUgVUlQcm9jZXNzCisgICAgICAgIHRvIHNjYWxlIHRoZSBBVlBsYXllciBmcm9t IGl0cyBpbml0aWFsIHNjcmVlbiBsb2NhdGlvbiwgYXMgd2VsbCBhcyBiYWNrIHRvIGl0cyBmaW5h bCBzY3JlZW4KKyAgICAgICAgbG9jYXRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFWVmlkZW9M YXllciBpbml0XSk6IEFkZGVkLCBpbml0aWFsaXplIHZpZGVvIGdyYXZpdHkgYW5kIGVuYWJsZSBj aGlsZCBsYXllciBtYXNraW5nLgorICAgICAgICAobGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9J bnNpZGVSZWN0KTogQWRkZWQgdXRpbGl0eSBtZXRob2QuCisgICAgICAgICgtW1dlYkFWVmlkZW9M YXllciBzZXRCb3VuZHM6XSk6IENyZWF0ZSBhIHRyYW5zZm9ybSB0byBzY2FsZSB0aGUgdmlkZW8g YXJlYS4KKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1 bGxzY3JlZW4pOiBCbG9jayBpbXBsaWNpdCBhbmltYXRpb25zIGR1cmluZyBzZXR1cC4KKyAgICAg ICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbik6IFJl c2V0IHRoZSBncmF2aXR5IHRvIFJlc2l6ZUFzcGVjdAorICAgICAgICAgICAgaWYgbmVjZXNzYXJ5 LgorCiAyMDE0LTA1LTAyICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIFdpcmVsZXNzIHBsYXliYWNrIGJ1dHRvbiBub3QgYmx1ZSB3aGVuIGFjdGl2ZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDEwMjQyZDVlOTM4MTkzMzE1NzYxMGE2 MmY0Zjg0N2RkMjFlY2EzYzUuLjlhZWUyNmNjNzFlOTVkOGFmYzIzYjQzYzI3YjQyMDc2Y2Q3ZTZh YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTM1MSwxNyArMzUxLDUyIEBA IFNPRlRfTElOSyhDb3JlTWVkaWEsIENNVGltZVN1YnRyYWN0LCBDTVRpbWUsIChDTVRpbWUgbWlu dWVuZCwgQ01UaW1lIHN1YnRyYWhlbmQpCiAgICAgcmV0dXJuIFtbW1dlYkFWVmlkZW9MYXllciBh bGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwogfQogCistIChpZClpbml0Cit7CisgICAgc2VsZiA9 IFtzdXBlciBpbml0XTsKKyAgICBpZiAoc2VsZikgeworICAgICAgICBzZWxmLm1hc2tzVG9Cb3Vu ZHMgPSBZRVM7CisgICAgICAgIHNlbGYudmlkZW9MYXllckdyYXZpdHkgPSBBVlZpZGVvTGF5ZXJH cmF2aXR5UmVzaXplQXNwZWN0OworICAgIH0KKyAgICByZXR1cm4gc2VsZjsKK30KKwogLSAodm9p ZClzZXRQbGF5ZXJDb250cm9sbGVyOihBVlBsYXllckNvbnRyb2xsZXIgKilwbGF5ZXJDb250cm9s bGVyCiB7CiAgICAgQVNTRVJUKCFwbGF5ZXJDb250cm9sbGVyIHx8IFtwbGF5ZXJDb250cm9sbGVy IGlzS2luZE9mQ2xhc3M6W1dlYkFWUGxheWVyQ29udHJvbGxlciBjbGFzc11dKTsKICAgICBfYXZQ bGF5ZXJDb250cm9sbGVyID0gKFdlYkFWUGxheWVyQ29udHJvbGxlciAqKXBsYXllckNvbnRyb2xs ZXI7CiB9CiAKK3N0YXRpYyBGbG9hdFJlY3QgbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNp ZGVSZWN0KGZsb2F0IGFzcGVjdFJhdGlvLCBGbG9hdFJlY3QgcmVjdCkKK3sKKyAgICBpZiAoYXNw ZWN0UmF0aW8gPiByZWN0LnNpemUoKS5hc3BlY3RSYXRpbygpKSB7CisgICAgICAgIGZsb2F0IGR5 ID0gcmVjdC53aWR0aCgpIC8gYXNwZWN0UmF0aW8gLSByZWN0LmhlaWdodCgpOworICAgICAgICBy ZWN0LmluZmxhdGVZKGR5IC8gMik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgZmxvYXQgZHggPSBy ZWN0LmhlaWdodCgpICogYXNwZWN0UmF0aW8gLSByZWN0LndpZHRoKCk7CisgICAgICAgIHJlY3Qu aW5mbGF0ZVgoZHggLyAyKTsKKyAgICB9CisgICAgcmV0dXJuIHJlY3Q7Cit9CisKIC0gKHZvaWQp c2V0Qm91bmRzOihDR1JlY3QpYm91bmRzCiB7CiAgICAgW3N1cGVyIHNldEJvdW5kczpib3VuZHNd OwotICAgIGlmIChbX2F2UGxheWVyQ29udHJvbGxlciBkZWxlZ2F0ZV0pCi0gICAgICAgIFtfYXZQ bGF5ZXJDb250cm9sbGVyIGRlbGVnYXRlXS0+c2V0VmlkZW9MYXllckZyYW1lKEZsb2F0UmVjdCgw LCAwLCBib3VuZHMuc2l6ZS53aWR0aCwgYm91bmRzLnNpemUuaGVpZ2h0KSk7CisKKyAgICBpZiAo IVtfYXZQbGF5ZXJDb250cm9sbGVyIGRlbGVnYXRlXSkKKyAgICAgICAgcmV0dXJuOworCisgICAg RmxvYXRSZWN0IHJvb3RCb3VuZHM7CisgICAgQ0FMYXllciAqcGFyZW50ID0gc2VsZjsKKyAgICB3 aGlsZSAoKHBhcmVudCA9IFtwYXJlbnQgc3VwZXJsYXllcl0pKQorICAgICAgICByb290Qm91bmRz ID0gW3BhcmVudCBib3VuZHNdOworCisgICAgW19hdlBsYXllckNvbnRyb2xsZXIgZGVsZWdhdGVd LT5zZXRWaWRlb0xheWVyRnJhbWUocm9vdEJvdW5kcyk7CisKKyAgICBGbG9hdFJlY3Qgc291cmNl Qm91bmRzID0gbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNpZGVSZWN0KENHUmVjdEdldFdp ZHRoKGJvdW5kcykgLyBDR1JlY3RHZXRIZWlnaHQoYm91bmRzKSwgcm9vdEJvdW5kcyk7CisgICAg Q0FUcmFuc2Zvcm0zRCB0cmFuc2Zvcm0gPSBDQVRyYW5zZm9ybTNETWFrZVNjYWxlKGJvdW5kcy5z aXplLndpZHRoIC8gc291cmNlQm91bmRzLndpZHRoKCksIGJvdW5kcy5zaXplLmhlaWdodCAvIHNv dXJjZUJvdW5kcy5oZWlnaHQoKSwgMSk7CisgICAgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRFRy YW5zbGF0ZSh0cmFuc2Zvcm0sIGJvdW5kcy5vcmlnaW4ueCAtIHNvdXJjZUJvdW5kcy54KCksIGJv dW5kcy5vcmlnaW4ueSAtIHNvdXJjZUJvdW5kcy55KCksIDApOworICAgIFtzZWxmIHNldFN1Ymxh eWVyVHJhbnNmb3JtOnRyYW5zZm9ybV07CiB9CiAKIC0gKHZvaWQpc2V0VmlkZW9MYXllckdyYXZp dHk6KEFWVmlkZW9MYXllckdyYXZpdHkpdmlkZW9MYXllckdyYXZpdHkKQEAgLTUxNyw3ICs1NTIs MTIgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2Ny ZWVuKFBsYXRmb3JtTGF5ZXImIHZpZGVvTGF5ZXIKICAgICBtX3ZpZGVvTGF5ZXIgPSAmdmlkZW9M YXllcjsKICAgICAKICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgp LCBeeworCisgICAgICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAgICAgICAgW0NBVHJhbnNh Y3Rpb24gc2V0RGlzYWJsZUFjdGlvbnM6WUVTXTsKKwogICAgICAgICBbbV92aWRlb0xheWVyIHJl bW92ZUZyb21TdXBlcmxheWVyXTsKKwogICAgICAgICAKICAgICAgICAgbV92aWRlb0xheWVyQ29u dGFpbmVyID0gW1dlYkFWVmlkZW9MYXllciB2aWRlb0xheWVyXTsKICAgICAgICAgW21fdmlkZW9M YXllckNvbnRhaW5lciBhZGRTdWJsYXllcjptX3ZpZGVvTGF5ZXIuZ2V0KCldOwpAQCAtNTUzLDYg KzU5Myw4IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVs bHNjcmVlbihQbGF0Zm9ybUxheWVyJiB2aWRlb0xheWVyCiAgICAgICAgICAgICB9XTsKICAgICAg ICAgfSk7CiAKKyAgICAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKKwogICAgICAgICBwcm90 ZWN0LmNsZWFyKCk7CiAgICAgfSk7CiB9CkBAIC01NjUsNiArNjA3LDggQEAgdm9pZCBXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW4oV2ViQ29yZTo6SW50UmVj dCBmaW5hbFJlY3QKICAgICAKICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCBeewogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XS5mcmFtZSA9 IGZpbmFsUmVjdDsKKyAgICAgICAgaWYgKFttX3ZpZGVvTGF5ZXJDb250YWluZXIgdmlkZW9MYXll ckdyYXZpdHldICE9IEFWVmlkZW9MYXllckdyYXZpdHlSZXNpemVBc3BlY3QpCisgICAgICAgICAg ICBbbV92aWRlb0xheWVyQ29udGFpbmVyIHNldFZpZGVvTGF5ZXJHcmF2aXR5OkFWVmlkZW9MYXll ckdyYXZpdHlSZXNpemVBc3BlY3RdOwogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBl eGl0RnVsbFNjcmVlbldpdGhDb21wbGV0aW9uSGFuZGxlcjpeKEJPT0wsIE5TRXJyb3IqKXsKICAg ICAgICAgICAgIFttX3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKICAgICAgICAgICAgIFttX3dpbmRv dyBzZXRSb290Vmlld0NvbnRyb2xsZXI6bmlsXTsK 230931 2014-05-06 14:16:52 -0700 2014-05-06 14:16:52 -0700 Patch for landing. bug-132603-20140506141645.patch text/plain 8500 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE0ZGUzYjBkMzQzZmEz YzdhYTFhMDkzOTk3ZjE3ZmZiZjI0ODdlYy4uNGZkZDk1MGVmZjdjZWI2Mzk2NDA3OTU1YzYxOTI5 MTNlZjBiMDMyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFuaW1hdGUgQVZQ bGF5ZXJMYXllciBpbnRvIGFuZCBvdXQgb2YgZnVsbCBzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjYwMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIHN5bmNocm9uaXplIGFu aW1hdGlvbnMgYWNyb3NzIHRoZSBXZWJQcm9jZXNzIC8gVUlQcm9jZXNzIGJvdW5kYXJ5LCBhbmlt YXRlCisgICAgICAgIHRoZSBBVlBsYXllckxheWVyIGludG8gcGxhY2UgYnkgZmlyc3QgcmVzaXpp bmcgdGhlIGZ1bGwgc2NyZWVuIGxheWVyIHRvIG9jY3VweSB0aGUKKyAgICAgICAgZW50aXJlIHNj cmVlbiBpbiB0aGUgV2ViUHJvY2VzcywgYW5kIHVzZSBhIHN1YmxheWVyVHJhbnNmb3JtIGFuaW1h dGlvbiBpbiB0aGUgVUlQcm9jZXNzCisgICAgICAgIHRvIHNjYWxlIHRoZSBBVlBsYXllciBmcm9t IGl0cyBpbml0aWFsIHNjcmVlbiBsb2NhdGlvbiwgYXMgd2VsbCBhcyBiYWNrIHRvIGl0cyBmaW5h bCBzY3JlZW4KKyAgICAgICAgbG9jYXRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HZW9tZXRyeVV0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsYXJnZXN0UmVjdFdp dGhBc3BlY3RSYXRpb0luc2lkZVJlY3QpOiBBZGRlZCB1dGlsaXR5IG1ldGhvZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9HZW9tZXRyeVV0aWxpdGllcy5oOgorICAgICAgICAqIHBsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKC1b V2ViQVZWaWRlb0xheWVyIGluaXRdKTogQWRkZWQsIGluaXRpYWxpemUgdmlkZW8gZ3Jhdml0eSBh bmQgZW5hYmxlIGNoaWxkIGxheWVyIG1hc2tpbmcuCisgICAgICAgICgtW1dlYkFWVmlkZW9MYXll ciBzZXRCb3VuZHM6XSk6IENyZWF0ZSBhIHRyYW5zZm9ybSB0byBzY2FsZSB0aGUgdmlkZW8gYXJl YS4KKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxz Y3JlZW4pOiBCbG9jayBpbXBsaWNpdCBhbmltYXRpb25zIGR1cmluZyBzZXR1cC4KKyAgICAgICAg KFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbik6IFJlc2V0 IHRoZSBncmF2aXR5IHRvIFJlc2l6ZUFzcGVjdAorICAgICAgICAgICAgaWYgbmVjZXNzYXJ5Lgor CiAyMDE0LTA1LTAyICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFtpT1NdIFdpcmVsZXNzIHBsYXliYWNrIGJ1dHRvbiBub3QgYmx1ZSB3aGVuIGFjdGl2ZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2VvbWV0cnlVdGlsaXRp ZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2VvbWV0cnlVdGlsaXRp ZXMuY3BwCmluZGV4IDkwYzk3MjUxNjhjZGNmM2E3M2ViODZiMzVlYjVhZWFjZmU4NDNmODAuLmQx OGFjMmIyYjliNjQ5OTQxNjc0NjI0OGJmMThmZGFjYmIzYWNlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dlb21ldHJ5VXRpbGl0aWVzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HZW9tZXRyeVV0aWxpdGllcy5jcHAKQEAg LTEwMSw0ICsxMDEsMTggQEAgRmxvYXRSZWN0IG1hcFJlY3QoY29uc3QgRmxvYXRSZWN0JiByLCBj b25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYKICAgICAgICAgci53aWR0 aCgpICogd2lkdGhTY2FsZSwgci5oZWlnaHQoKSAqIGhlaWdodFNjYWxlKTsKIH0KIAorRmxvYXRS ZWN0IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdChmbG9hdCBhc3BlY3RSYXRp bywgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0KQoreworICAgIEZsb2F0UmVjdCBkZXN0UmVjdCA9 IHNyY1JlY3Q7CisKKyAgICBpZiAoYXNwZWN0UmF0aW8gPiBzcmNSZWN0LnNpemUoKS5hc3BlY3RS YXRpbygpKSB7CisgICAgICAgIGZsb2F0IGR5ID0gZGVzdFJlY3Qud2lkdGgoKSAvIGFzcGVjdFJh dGlvIC0gZGVzdFJlY3QuaGVpZ2h0KCk7CisgICAgICAgIGRlc3RSZWN0LmluZmxhdGVZKGR5IC8g Mik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgZmxvYXQgZHggPSBkZXN0UmVjdC5oZWlnaHQoKSAq IGFzcGVjdFJhdGlvIC0gZGVzdFJlY3Qud2lkdGgoKTsKKyAgICAgICAgZGVzdFJlY3QuaW5mbGF0 ZVgoZHggLyAyKTsKKyAgICB9CisgICAgcmV0dXJuIGRlc3RSZWN0OworfQorCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HZW9tZXRyeVV0aWxpdGllcy5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2VvbWV0cnlVdGlsaXRpZXMuaApp bmRleCA1ZTM3MzE4MWJiY2E1YTZiYzJiMDhjMmEzNTljMzNiM2Y1MjliZjkyLi44M2FiZDNjYTk0 ZjBmNjdhOTg5YjY5MmRkMjdkZmE3ODRkOGE1MmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HZW9tZXRyeVV0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dlb21ldHJ5VXRpbGl0aWVzLmgKQEAgLTQzLDYgKzQzLDgg QEAgRmxvYXRSZWN0IHVuaW9uUmVjdChjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYpOwogLy8gTWFw IHJlY3QgciBmcm9tIHNyY1JlY3QgdG8gYW4gZXF1aXZhbGVudCByZWN0IGluIGRlc3RSZWN0Lgog RmxvYXRSZWN0IG1hcFJlY3QoY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgRmxvYXRSZWN0JiBzcmNS ZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0KTsKIAorRmxvYXRSZWN0IGxhcmdlc3RSZWN0 V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdChmbG9hdCBhc3BlY3RSYXRpbywgY29uc3QgRmxvYXRS ZWN0Jik7CisKIH0KIAogI2VuZGlmIC8vIEdlb21ldHJ5VXRpbGl0aWVzX2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VB VktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5tbQppbmRleCAxMDI0MmQ1ZTkzODE5MzMxNTc2MTBhNjJmNGY4NDdkZDIx ZWNhM2M1Li5lN2IyODMzNGE5ZjRjMDcwOTBmODljODBiZjExNzUxOWI5OWI0YzU2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0ICJXZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oIgogCiAjaW1wb3J0ICJMb2dnaW5nLmgiCisj aW1wb3J0ICJHZW9tZXRyeVV0aWxpdGllcy5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVu TW9kZWwuaCIKICNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlRpbWUuaD4KICNpbXBvcnQgPEFWS2l0 L0FWS2l0Lmg+CkBAIC0zMzcsMTIgKzMzOCwxNCBAQCBTT0ZUX0xJTksoQ29yZU1lZGlhLCBDTVRp bWVTdWJ0cmFjdCwgQ01UaW1lLCAoQ01UaW1lIG1pbnVlbmQsIENNVGltZSBzdWJ0cmFoZW5kKQog QHByb3BlcnR5IChub25hdG9taWMpIEFWVmlkZW9MYXllckdyYXZpdHkgdmlkZW9MYXllckdyYXZp dHk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgZ2V0dGVyID0gaXNSZWFkeUZvckRpc3BsYXkpIEJP T0wgcmVhZHlGb3JEaXNwbGF5OwogQHByb3BlcnR5IChub25hdG9taWMpIENHUmVjdCB2aWRlb1Jl Y3Q7CistICh2b2lkKXNldFBsYXllclZpZXdDb250cm9sbGVyOihBVlBsYXllclZpZXdDb250cm9s bGVyICopcGxheWVyVmlld0NvbnRyb2xsZXI7CiAtICh2b2lkKXNldFBsYXllckNvbnRyb2xsZXI6 KEFWUGxheWVyQ29udHJvbGxlciAqKXBsYXllckNvbnRyb2xsZXI7CiBAZW5kCiAKIEBpbXBsZW1l bnRhdGlvbiBXZWJBVlZpZGVvTGF5ZXIKIHsKICAgICBSZXRhaW5QdHI8V2ViQVZQbGF5ZXJDb250 cm9sbGVyPiBfYXZQbGF5ZXJDb250cm9sbGVyOworICAgIFJldGFpblB0cjxBVlBsYXllclZpZXdD b250cm9sbGVyPiBfYXZQbGF5ZXJWaWV3Q29udHJvbGxlcjsKICAgICBBVlZpZGVvTGF5ZXJHcmF2 aXR5IF92aWRlb0xheWVyR3Jhdml0eTsKIH0KIApAQCAtMzUxLDE3ICszNTQsNDUgQEAgU09GVF9M SU5LKENvcmVNZWRpYSwgQ01UaW1lU3VidHJhY3QsIENNVGltZSwgKENNVGltZSBtaW51ZW5kLCBD TVRpbWUgc3VidHJhaGVuZCkKICAgICByZXR1cm4gW1tbV2ViQVZWaWRlb0xheWVyIGFsbG9jXSBp bml0XSBhdXRvcmVsZWFzZV07CiB9CiAKKy0gKGluc3RhbmNldHlwZSlpbml0Cit7CisgICAgc2Vs ZiA9IFtzdXBlciBpbml0XTsKKyAgICBpZiAoc2VsZikgeworICAgICAgICBbc2VsZiBzZXRNYXNr c1RvQm91bmRzOllFU107CisgICAgICAgIFtzZWxmIHNldFZpZGVvTGF5ZXJHcmF2aXR5OkFWVmlk ZW9MYXllckdyYXZpdHlSZXNpemVBc3BlY3RdOworICAgIH0KKyAgICByZXR1cm4gc2VsZjsKK30K KwogLSAodm9pZClzZXRQbGF5ZXJDb250cm9sbGVyOihBVlBsYXllckNvbnRyb2xsZXIgKilwbGF5 ZXJDb250cm9sbGVyCiB7CiAgICAgQVNTRVJUKCFwbGF5ZXJDb250cm9sbGVyIHx8IFtwbGF5ZXJD b250cm9sbGVyIGlzS2luZE9mQ2xhc3M6W1dlYkFWUGxheWVyQ29udHJvbGxlciBjbGFzc11dKTsK ICAgICBfYXZQbGF5ZXJDb250cm9sbGVyID0gKFdlYkFWUGxheWVyQ29udHJvbGxlciAqKXBsYXll ckNvbnRyb2xsZXI7CiB9CiAKKy0gKHZvaWQpc2V0UGxheWVyVmlld0NvbnRyb2xsZXI6KEFWUGxh eWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgoreworICAgIF9hdlBsYXll clZpZXdDb250cm9sbGVyID0gcGxheWVyVmlld0NvbnRyb2xsZXI7Cit9CisKIC0gKHZvaWQpc2V0 Qm91bmRzOihDR1JlY3QpYm91bmRzCiB7CiAgICAgW3N1cGVyIHNldEJvdW5kczpib3VuZHNdOwot ICAgIGlmIChbX2F2UGxheWVyQ29udHJvbGxlciBkZWxlZ2F0ZV0pCi0gICAgICAgIFtfYXZQbGF5 ZXJDb250cm9sbGVyIGRlbGVnYXRlXS0+c2V0VmlkZW9MYXllckZyYW1lKEZsb2F0UmVjdCgwLCAw LCBib3VuZHMuc2l6ZS53aWR0aCwgYm91bmRzLnNpemUuaGVpZ2h0KSk7CisKKyAgICBpZiAoIVtf YXZQbGF5ZXJDb250cm9sbGVyIGRlbGVnYXRlXSB8fCAhX2F2UGxheWVyVmlld0NvbnRyb2xsZXIp CisgICAgICAgIHJldHVybjsKKworICAgIFVJVmlldyogcm9vdFZpZXcgPSBbW19hdlBsYXllclZp ZXdDb250cm9sbGVyIHBhcmVudFZpZXdDb250cm9sbGVyXSB2aWV3XTsKKyAgICBpZiAoIXJvb3RW aWV3KQorICAgICAgICByZXR1cm47CisKKyAgICBGbG9hdFJlY3Qgcm9vdEJvdW5kcyA9IFtyb290 VmlldyBib3VuZHNdOworICAgIFtfYXZQbGF5ZXJDb250cm9sbGVyIGRlbGVnYXRlXS0+c2V0Vmlk ZW9MYXllckZyYW1lKHJvb3RCb3VuZHMpOworCisgICAgRmxvYXRSZWN0IHNvdXJjZUJvdW5kcyA9 IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdChDR1JlY3RHZXRXaWR0aChib3Vu ZHMpIC8gQ0dSZWN0R2V0SGVpZ2h0KGJvdW5kcyksIHJvb3RCb3VuZHMpOworICAgIENBVHJhbnNm b3JtM0QgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShib3VuZHMuc2l6ZS53aWR0 aCAvIHNvdXJjZUJvdW5kcy53aWR0aCgpLCBib3VuZHMuc2l6ZS5oZWlnaHQgLyBzb3VyY2VCb3Vu ZHMuaGVpZ2h0KCksIDEpOworICAgIHRyYW5zZm9ybSA9IENBVHJhbnNmb3JtM0RUcmFuc2xhdGUo dHJhbnNmb3JtLCBib3VuZHMub3JpZ2luLnggLSBzb3VyY2VCb3VuZHMueCgpLCBib3VuZHMub3Jp Z2luLnkgLSBzb3VyY2VCb3VuZHMueSgpLCAwKTsKKyAgICBbc2VsZiBzZXRTdWJsYXllclRyYW5z Zm9ybTp0cmFuc2Zvcm1dOwogfQogCiAtICh2b2lkKXNldFZpZGVvTGF5ZXJHcmF2aXR5OihBVlZp ZGVvTGF5ZXJHcmF2aXR5KXZpZGVvTGF5ZXJHcmF2aXR5CkBAIC01MTcsNiArNTQ4LDEwIEBAIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbihQbGF0 Zm9ybUxheWVyJiB2aWRlb0xheWVyCiAgICAgbV92aWRlb0xheWVyID0gJnZpZGVvTGF5ZXI7CiAg ICAgCiAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKwor ICAgICAgICBbQ0FUcmFuc2FjdGlvbiBiZWdpbl07CisgICAgICAgIFtDQVRyYW5zYWN0aW9uIHNl dERpc2FibGVBY3Rpb25zOllFU107CisKICAgICAgICAgW21fdmlkZW9MYXllciByZW1vdmVGcm9t U3VwZXJsYXllcl07CiAgICAgICAgIAogICAgICAgICBtX3ZpZGVvTGF5ZXJDb250YWluZXIgPSBb V2ViQVZWaWRlb0xheWVyIHZpZGVvTGF5ZXJdOwpAQCAtNTI5LDYgKzU2NCw3IEBAIHZvaWQgV2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbihQbGF0Zm9ybUxh eWVyJiB2aWRlb0xheWVyCiAgICAgICAgIG1fcGxheWVyVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5T KFtbY2xhc3NBVlBsYXllclZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFZpZGVvTGF5ZXI6 bV92aWRlb0xheWVyQ29udGFpbmVyLmdldCgpXSk7CiAgICAgICAgIFttX3BsYXllclZpZXdDb250 cm9sbGVyIHNldFBsYXllckNvbnRyb2xsZXI6KEFWUGxheWVyQ29udHJvbGxlciAqKXBsYXllckNv bnRyb2xsZXIoKV07CiAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHNldERlbGVnYXRl OnBsYXllckNvbnRyb2xsZXIoKV07CisgICAgICAgIFttX3ZpZGVvTGF5ZXJDb250YWluZXIgc2V0 UGxheWVyVmlld0NvbnRyb2xsZXI6bV9wbGF5ZXJWaWV3Q29udHJvbGxlci5nZXQoKV07CiAgICAg ICAgIAogICAgICAgICBtX3ZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbW2NsYXNzVUlWaWV3Q29u dHJvbGxlciBhbGxvY10gaW5pdF0pOwogCkBAIC01NTMsNiArNTg5LDggQEAgdm9pZCBXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVuKFBsYXRmb3JtTGF5ZXIm IHZpZGVvTGF5ZXIKICAgICAgICAgICAgIH1dOwogICAgICAgICB9KTsKIAorICAgICAgICBbQ0FU cmFuc2FjdGlvbiBjb21taXRdOworCiAgICAgICAgIHByb3RlY3QuY2xlYXIoKTsKICAgICB9KTsK IH0KQEAgLTU2NSw2ICs2MDMsOCBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpleGl0RnVsbHNjcmVlbihXZWJDb3JlOjpJbnRSZWN0IGZpbmFsUmVjdAogICAgIAogICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgIFtt X3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddLmZyYW1lID0gZmluYWxSZWN0OworICAgICAgICBp ZiAoW21fdmlkZW9MYXllckNvbnRhaW5lciB2aWRlb0xheWVyR3Jhdml0eV0gIT0gQVZWaWRlb0xh eWVyR3Jhdml0eVJlc2l6ZUFzcGVjdCkKKyAgICAgICAgICAgIFttX3ZpZGVvTGF5ZXJDb250YWlu ZXIgc2V0VmlkZW9MYXllckdyYXZpdHk6QVZWaWRlb0xheWVyR3Jhdml0eVJlc2l6ZUFzcGVjdF07 CiAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuV2l0aENvbXBs ZXRpb25IYW5kbGVyOl4oQk9PTCwgTlNFcnJvciopewogICAgICAgICAgICAgW21fd2luZG93IHNl dEhpZGRlbjpZRVNdOwogICAgICAgICAgICAgW21fd2luZG93IHNldFJvb3RWaWV3Q29udHJvbGxl cjpuaWxdOwpAQCAtNTc2LDYgKzYxNiw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKFdlYkNvcmU6OkludFJlY3QgZmluYWxSZWN0CiAgICAg ICAgICAgICBbbV92aWRlb0xheWVyIHJlbW92ZUZyb21TdXBlcmxheWVyXTsKICAgICAgICAgICAg IG1fdmlkZW9MYXllciA9IG5pbDsKICAgICAgICAgICAgIFttX3ZpZGVvTGF5ZXJDb250YWluZXIg cmVtb3ZlRnJvbVN1cGVybGF5ZXJdOworICAgICAgICAgICAgW21fdmlkZW9MYXllckNvbnRhaW5l ciBzZXRQbGF5ZXJWaWV3Q29udHJvbGxlcjpuaWxdOwogICAgICAgICAgICAgbV92aWRlb0xheWVy Q29udGFpbmVyID0gbmlsOwogCiAgICAgICAgICAgICBpZiAobV9mdWxsc2NyZWVuQ2hhbmdlT2Jz ZXJ2ZXIpCg==