175152 2017-08-03 13:24:37 -0700 Improve WebKitLegacy video fullscreen animation begin and end rects. 2017-11-02 11:27:22 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1334914 0 jeremyj-wk 2017-08-03 13:24:37 -0700 Improve WebKitLegacy video fullscreen animation begin and end rects. 1334918 1 jeremyj-wk 2017-08-03 13:29:12 -0700 rdar://problem/32840576 1334922 2 317146 jeremyj-wk 2017-08-03 13:34:40 -0700 Created attachment 317146 Patch 1334924 3 317146 eric.carlson 2017-08-03 13:45:06 -0700 Comment on attachment 317146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317146&action=review > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:236 > +static NSRect frameExpandedToRatioOfFrame(NSRect frameToExpand, NSRect frame) Nit: NSRect& > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:284 > NSRect frame = [self videoElementRect]; > NSRect endFrame = [screen frame]; > - constrainFrameToRatioOfFrame(&endFrame, &frame); > + frame = frameExpandedToRatioOfFrame(frame, endFrame); Nit: this would be slightly cleaner as something like NSRect frame = frameExpandedToRatioOfFrame([self videoElementRect], endFrame); 1334942 4 jeremyj-wk 2017-08-03 14:25:36 -0700 (In reply to Eric Carlson from comment #3) > Comment on attachment 317146 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=317146&action=review > > > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:236 > > +static NSRect frameExpandedToRatioOfFrame(NSRect frameToExpand, NSRect frame) > > Nit: NSRect& > For small structs the cost of indirection might be higher than the cost of copying. > > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:284 > > NSRect frame = [self videoElementRect]; > > NSRect endFrame = [screen frame]; > > - constrainFrameToRatioOfFrame(&endFrame, &frame); > > + frame = frameExpandedToRatioOfFrame(frame, endFrame); > > Nit: this would be slightly cleaner as something like > > NSRect frame = frameExpandedToRatioOfFrame([self videoElementRect], > endFrame); Done. 1334999 5 317174 jeremyj-wk 2017-08-03 15:56:08 -0700 Created attachment 317174 Patch for landing. 1335084 6 317174 commit-queue 2017-08-03 18:58:36 -0700 Comment on attachment 317174 Patch for landing. Clearing flags on attachment: 317174 Committed r220248: <http://trac.webkit.org/changeset/220248> 317146 2017-08-03 13:34:40 -0700 2017-08-04 09:08:32 -0700 Patch bug-175152-20170803133439.patch text/plain 5017 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmExOWZhNmYzNWJlZDhi YjMzNDAxYzgwMDUwMWY4OTg1MDQ5MDc4ZC4uZjZhODk4NzhjM2FmODE0NzFjZjY3NmUyYTFiN2Ji M2YwOWUzYmVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA4LTAzICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIFdlYktpdExl Z2FjeSB2aWRlbyBmdWxsc2NyZWVuIGFuaW1hdGlvbiBiZWdpbiBhbmQgZW5kIHJlY3RzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MTUyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBiZWN1YXNlIHRoaXMgY2hhbmdlIGhhcyBubyBlZmZlY3Qgb24gdGhlIERPTS4KKworICAgICAg ICBUaGlzIGNoYW5nZSB1c2VzIGRpZmZlcmVudCByZWN0cyBmb3IgZnVsbHNjcmVlbiBhbmltYXRp b24gdG8gcHJldmVudCB0aGUgYW5pbWF0aW9uCisgICAgICAgIGZyb20gZmFpbGluZywgYW5kIHRv IGltcHJvdmUgdGhlIGFlc3RoZXRpY3Mgb2YgdGhlIGFuaW1hdGlvbi4KKworICAgICAgICAqIHBs YXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tOgorICAgICAgICAoZnJh bWVFeHBhbmRlZFRvUmF0aW9PZkZyYW1lKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlciBlbnRlckZ1bGxzY3JlZW46XSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXIgZXhpdEZ1bGxzY3JlZW5dKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxs c2NyZWVuV2luZG93IGFuaW1hdGVGcm9tUmVjdDp0b1JlY3Q6d2l0aFN1YkFuaW1hdGlvbjpjb250 cm9sbGVyQWN0aW9uOl0pOgorICAgICAgICAoY29uc3RyYWluRnJhbWVUb1JhdGlvT2ZGcmFtZSk6 IERlbGV0ZWQuCisKIDIwMTctMDctMjcgIEplcmVteSBKb25lcyAgPGplcmVteWpAYXBwbGUuY29t PgogCiAgICAgICAgIERvbid0IG92ZXJyaWRlIF9hbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxh eWJhY2sgaW4gTWVkaWFEb2N1bWVudCB3aXRoIHBsYXlzaW5saW5lQXR0ci4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVy Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0KaW5kZXggMTUyYjY3NDcxNTBhM2ZmMmFmMWNmZTMxY2YwZjU4MDhhM2NlZTEwYy4u MGRhZTg4MDE4MTJlZTUxMGFiOTM4YTFlYjA0MmM3MTdmYWE5ODdkYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0KQEAgLTIzMywyMiArMjMzLDI0IEBAIC0gKHZvaWQpYXBwbGljYXRpb25EaWRSZXNp Z25BY3RpdmU6KE5TTm90aWZpY2F0aW9uKilub3RpZmljYXRpb24KIC8vIE1BUks6IC0KIC8vIE1B Uks6IEV4cG9zZWQgSW50ZXJmYWNlCiAKLXN0YXRpYyB2b2lkIGNvbnN0cmFpbkZyYW1lVG9SYXRp b09mRnJhbWUoTlNSZWN0ICpmcmFtZVRvQ29uc3RyYWluLCBjb25zdCBOU1JlY3QgKmZyYW1lKQor c3RhdGljIE5TUmVjdCBmcmFtZUV4cGFuZGVkVG9SYXRpb09mRnJhbWUoTlNSZWN0IGZyYW1lVG9F eHBhbmQsIE5TUmVjdCBmcmFtZSkKIHsKICAgICAvLyBLZWVwIGEgY29uc3RyYWluZWQgYXNwZWN0 IHJhdGlvIGZvciB0aGUgZGVzdGluYXRpb24gd2luZG93Ci0gICAgQ0dGbG9hdCBvcmlnaW5hbFJh dGlvID0gZnJhbWUtPnNpemUud2lkdGggLyBmcmFtZS0+c2l6ZS5oZWlnaHQ7Ci0gICAgQ0dGbG9h dCBuZXdSYXRpbyA9IGZyYW1lVG9Db25zdHJhaW4tPnNpemUud2lkdGggLyBmcmFtZVRvQ29uc3Ry YWluLT5zaXplLmhlaWdodDsKKyAgICBOU1JlY3QgcmVzdWx0ID0gZnJhbWVUb0V4cGFuZDsKKyAg ICBDR0Zsb2F0IG5ld1JhdGlvID0gZnJhbWUuc2l6ZS53aWR0aCAvIGZyYW1lLnNpemUuaGVpZ2h0 OworICAgIENHRmxvYXQgb3JpZ2luYWxSYXRpbyA9IGZyYW1lVG9FeHBhbmQuc2l6ZS53aWR0aCAv IGZyYW1lVG9FeHBhbmQuc2l6ZS5oZWlnaHQ7CiAgICAgaWYgKG5ld1JhdGlvID4gb3JpZ2luYWxS YXRpbykgewotICAgICAgICBDR0Zsb2F0IG5ld1dpZHRoID0gb3JpZ2luYWxSYXRpbyAqIGZyYW1l VG9Db25zdHJhaW4tPnNpemUuaGVpZ2h0OwotICAgICAgICBDR0Zsb2F0IGRpZmYgPSBmcmFtZVRv Q29uc3RyYWluLT5zaXplLndpZHRoIC0gbmV3V2lkdGg7Ci0gICAgICAgIGZyYW1lVG9Db25zdHJh aW4tPnNpemUud2lkdGggPSBuZXdXaWR0aDsKLSAgICAgICAgZnJhbWVUb0NvbnN0cmFpbi0+b3Jp Z2luLnggKz0gZGlmZiAvIDI7CisgICAgICAgIENHRmxvYXQgbmV3V2lkdGggPSBuZXdSYXRpbyAq IGZyYW1lVG9FeHBhbmQuc2l6ZS5oZWlnaHQ7CisgICAgICAgIENHRmxvYXQgZGlmZiA9IG5ld1dp ZHRoIC0gZnJhbWVUb0V4cGFuZC5zaXplLndpZHRoOworICAgICAgICByZXN1bHQuc2l6ZS53aWR0 aCA9IG5ld1dpZHRoOworICAgICAgICByZXN1bHQub3JpZ2luLnggLT0gZGlmZiAvIDI7CiAgICAg fSBlbHNlIHsKLSAgICAgICAgQ0dGbG9hdCBuZXdIZWlnaHQgPSBmcmFtZVRvQ29uc3RyYWluLT5z aXplLndpZHRoIC8gb3JpZ2luYWxSYXRpbzsKLSAgICAgICAgQ0dGbG9hdCBkaWZmID0gZnJhbWVU b0NvbnN0cmFpbi0+c2l6ZS5oZWlnaHQgLSBuZXdIZWlnaHQ7Ci0gICAgICAgIGZyYW1lVG9Db25z dHJhaW4tPnNpemUuaGVpZ2h0ID0gbmV3SGVpZ2h0OwotICAgICAgICBmcmFtZVRvQ29uc3RyYWlu LT5vcmlnaW4ueSArPSBkaWZmIC8gMjsKLSAgICB9ICAgIAorICAgICAgICBDR0Zsb2F0IG5ld0hl aWdodCA9IGZyYW1lVG9FeHBhbmQuc2l6ZS53aWR0aCAvIG5ld1JhdGlvOworICAgICAgICBDR0Zs b2F0IGRpZmYgPSBuZXdIZWlnaHQgLSBmcmFtZVRvRXhwYW5kLnNpemUuaGVpZ2h0OworICAgICAg ICByZXN1bHQuc2l6ZS5oZWlnaHQgPSBuZXdIZWlnaHQ7CisgICAgICAgIHJlc3VsdC5vcmlnaW4u eSAtPSBkaWZmIC8gMjsKKyAgICB9CisgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAogc3RhdGljIE5T V2luZG93ICpjcmVhdGVCYWNrZ3JvdW5kRnVsbHNjcmVlbldpbmRvdyhOU1JlY3QgZnJhbWUsIGlu dCBsZXZlbCkKQEAgLTI3OSw3ICsyODEsNyBAQCAtICh2b2lkKWVudGVyRnVsbHNjcmVlbjooTlNT Y3JlZW4gKilzY3JlZW4KIAogICAgIE5TUmVjdCBmcmFtZSA9IFtzZWxmIHZpZGVvRWxlbWVudFJl Y3RdOwogICAgIE5TUmVjdCBlbmRGcmFtZSA9IFtzY3JlZW4gZnJhbWVdOwotICAgIGNvbnN0cmFp bkZyYW1lVG9SYXRpb09mRnJhbWUoJmVuZEZyYW1lLCAmZnJhbWUpOworICAgIGZyYW1lID0gZnJh bWVFeHBhbmRlZFRvUmF0aW9PZkZyYW1lKGZyYW1lLCBlbmRGcmFtZSk7CiAKICAgICAvLyBDcmVh dGUgYSBibGFjayB3aW5kb3cgaWYgbmVlZGVkCiAgICAgaWYgKCFfYmFja2dyb3VuZEZ1bGxzY3Jl ZW5XaW5kb3cpCkBAIC0zMTYsOCArMzE4LDExIEBAIC0gKHZvaWQpZXhpdEZ1bGxzY3JlZW4KICAg ICAvLyBJZiBvdXIgb3duZXIgcmVsZWFzZXMgdXMgd2UgY291bGQgY3Jhc2ggaWYgdGhpcyBpcyBu b3QgdGhlIGNhc2UuCiAgICAgLy8gQmFsYW5jZWQgaW4gd2luZG93RGlkRXhpdEZ1bGxzY3JlZW4K ICAgICBbc2VsZiByZXRhaW5dOyAgICAKLSAgICAKLSAgICBbW3NlbGYgZnVsbHNjcmVlbldpbmRv d10gYW5pbWF0ZUZyb21SZWN0Oltbc2VsZiB3aW5kb3ddIGZyYW1lXSB0b1JlY3Q6ZW5kRnJhbWUg d2l0aFN1YkFuaW1hdGlvbjpfZmFkZUFuaW1hdGlvbiBjb250cm9sbGVyQWN0aW9uOkBzZWxlY3Rv cih3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbildOworCisgICAgTlNSZWN0IHN0YXJ0RnJhbWUgPSBb W3NlbGYgd2luZG93XSBmcmFtZV07CisgICAgZW5kRnJhbWUgPSBmcmFtZUV4cGFuZGVkVG9SYXRp b09mRnJhbWUoZW5kRnJhbWUsIHN0YXJ0RnJhbWUpOworCisgICAgW1tzZWxmIGZ1bGxzY3JlZW5X aW5kb3ddIGFuaW1hdGVGcm9tUmVjdDpzdGFydEZyYW1lIHRvUmVjdDplbmRGcmFtZSB3aXRoU3Vi QW5pbWF0aW9uOl9mYWRlQW5pbWF0aW9uIGNvbnRyb2xsZXJBY3Rpb246QHNlbGVjdG9yKHdpbmRv d0RpZEV4aXRGdWxsc2NyZWVuKV07CiB9CiAKIC0gKHZvaWQpYXBwbGljYXRpb25EaWRDaGFuZ2VT Y3JlZW5QYXJhbWV0ZXJzOihOU05vdGlmaWNhdGlvbiopbm90aWZpY2F0aW9uCkBAIC01MDQsNyAr NTA5LDcgQEAgLSAodm9pZClhbmltYXRlRnJvbVJlY3Q6KE5TUmVjdClzdGFydFJlY3QgdG9SZWN0 OihOU1JlY3QpZW5kUmVjdCB3aXRoU3ViQW5pbWF0aW8KICAgICBpZiAoIXdhc0FuaW1hdGluZykg ewogICAgICAgICAvLyBXZSdsbCBkb3duc2NhbGUgdGhlIHdpbmRvdyBkdXJpbmcgdGhlIGFuaW1h dGlvbiBiYXNlZCBvbiB0aGUgaGlnaGVyIHJlc29sdXRpb24gcmVjdAogICAgICAgICBCT09MIGhp Z2hlclJlc29sdXRpb25Jc0VuZFJlY3QgPSBzdGFydFJlY3Quc2l6ZS53aWR0aCA8IGVuZFJlY3Qu c2l6ZS53aWR0aCAmJiBzdGFydFJlY3Quc2l6ZS5oZWlnaHQgPCBlbmRSZWN0LnNpemUuaGVpZ2h0 OwotICAgICAgICBbc2VsZiBzZXRGcmFtZTpoaWdoZXJSZXNvbHV0aW9uSXNFbmRSZWN0ID8gZW5k UmVjdCA6IHN0YXJ0UmVjdCBkaXNwbGF5Ok5PXTsgICAgICAgIAorICAgICAgICBbc2VsZiBzZXRG cmFtZTpoaWdoZXJSZXNvbHV0aW9uSXNFbmRSZWN0ID8gZW5kUmVjdCA6IHN0YXJ0UmVjdCBkaXNw bGF5Ok5PXTsKICAgICB9CiAgICAgCiAgICAgQVNTRVJUKCFfZnVsbHNjcmVlbkFuaW1hdGlvbik7 Cg== 317174 2017-08-03 15:56:08 -0700 2017-08-03 18:58:36 -0700 Patch for landing. bug-175152-20170803155607.patch text/plain 5132 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmExOWZhNmYzNWJlZDhi YjMzNDAxYzgwMDUwMWY4OTg1MDQ5MDc4ZC4uZDM3NDhhYTYxN2FjMGNlMjU0ZDhmODFmZWIwMjMw MzJmZmU1ZTAwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA4LTAzICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIFdlYktpdExl Z2FjeSB2aWRlbyBmdWxsc2NyZWVuIGFuaW1hdGlvbiBiZWdpbiBhbmQgZW5kIHJlY3RzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MTUyCisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzMyODQwNTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBD YXJsc29uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYmVjdWFzZSB0aGlzIGNoYW5nZSBoYXMg bm8gZWZmZWN0IG9uIHRoZSBET00uCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgdXNlcyBkaWZmZXJl bnQgcmVjdHMgZm9yIGZ1bGxzY3JlZW4gYW5pbWF0aW9uIHRvIHByZXZlbnQgdGhlIGFuaW1hdGlv bgorICAgICAgICBmcm9tIGZhaWxpbmcsIGFuZCB0byBpbXByb3ZlIHRoZSBhZXN0aGV0aWNzIG9m IHRoZSBhbmltYXRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKGZyYW1lRXhwYW5kZWRUb1JhdGlvT2ZGcmFtZSk6 CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgZW50ZXJGdWxsc2NyZWVu Ol0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIGV4aXRGdWxsc2Ny ZWVuXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbldpbmRvdyBhbmltYXRlRnJvbVJl Y3Q6dG9SZWN0OndpdGhTdWJBbmltYXRpb246Y29udHJvbGxlckFjdGlvbjpdKToKKyAgICAgICAg KGNvbnN0cmFpbkZyYW1lVG9SYXRpb09mRnJhbWUpOiBEZWxldGVkLgorCiAyMDE3LTA3LTI3ICBK ZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBEb24ndCBvdmVycmlk ZSBfYWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNrIGluIE1lZGlhRG9jdW1lbnQgd2l0 aCBwbGF5c2lubGluZUF0dHIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCmluZGV4IDE1MmI2NzQ3MTUw YTNmZjJhZjFjZmUzMWNmMGY1ODA4YTNjZWUxMGMuLjY1ODdhMjkxYmUyYmZlZGE3YjAzMTU0MWE1 NDVhODkwMDgwOThkZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCkBAIC0yMzMsMjIgKzIzMywy NCBAQCAtICh2b2lkKWFwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlOihOU05vdGlmaWNhdGlvbiop bm90aWZpY2F0aW9uCiAvLyBNQVJLOiAtCiAvLyBNQVJLOiBFeHBvc2VkIEludGVyZmFjZQogCi1z dGF0aWMgdm9pZCBjb25zdHJhaW5GcmFtZVRvUmF0aW9PZkZyYW1lKE5TUmVjdCAqZnJhbWVUb0Nv bnN0cmFpbiwgY29uc3QgTlNSZWN0ICpmcmFtZSkKK3N0YXRpYyBOU1JlY3QgZnJhbWVFeHBhbmRl ZFRvUmF0aW9PZkZyYW1lKE5TUmVjdCBmcmFtZVRvRXhwYW5kLCBOU1JlY3QgZnJhbWUpCiB7CiAg ICAgLy8gS2VlcCBhIGNvbnN0cmFpbmVkIGFzcGVjdCByYXRpbyBmb3IgdGhlIGRlc3RpbmF0aW9u IHdpbmRvdwotICAgIENHRmxvYXQgb3JpZ2luYWxSYXRpbyA9IGZyYW1lLT5zaXplLndpZHRoIC8g ZnJhbWUtPnNpemUuaGVpZ2h0OwotICAgIENHRmxvYXQgbmV3UmF0aW8gPSBmcmFtZVRvQ29uc3Ry YWluLT5zaXplLndpZHRoIC8gZnJhbWVUb0NvbnN0cmFpbi0+c2l6ZS5oZWlnaHQ7CisgICAgTlNS ZWN0IHJlc3VsdCA9IGZyYW1lVG9FeHBhbmQ7CisgICAgQ0dGbG9hdCBuZXdSYXRpbyA9IGZyYW1l LnNpemUud2lkdGggLyBmcmFtZS5zaXplLmhlaWdodDsKKyAgICBDR0Zsb2F0IG9yaWdpbmFsUmF0 aW8gPSBmcmFtZVRvRXhwYW5kLnNpemUud2lkdGggLyBmcmFtZVRvRXhwYW5kLnNpemUuaGVpZ2h0 OwogICAgIGlmIChuZXdSYXRpbyA+IG9yaWdpbmFsUmF0aW8pIHsKLSAgICAgICAgQ0dGbG9hdCBu ZXdXaWR0aCA9IG9yaWdpbmFsUmF0aW8gKiBmcmFtZVRvQ29uc3RyYWluLT5zaXplLmhlaWdodDsK LSAgICAgICAgQ0dGbG9hdCBkaWZmID0gZnJhbWVUb0NvbnN0cmFpbi0+c2l6ZS53aWR0aCAtIG5l d1dpZHRoOwotICAgICAgICBmcmFtZVRvQ29uc3RyYWluLT5zaXplLndpZHRoID0gbmV3V2lkdGg7 Ci0gICAgICAgIGZyYW1lVG9Db25zdHJhaW4tPm9yaWdpbi54ICs9IGRpZmYgLyAyOworICAgICAg ICBDR0Zsb2F0IG5ld1dpZHRoID0gbmV3UmF0aW8gKiBmcmFtZVRvRXhwYW5kLnNpemUuaGVpZ2h0 OworICAgICAgICBDR0Zsb2F0IGRpZmYgPSBuZXdXaWR0aCAtIGZyYW1lVG9FeHBhbmQuc2l6ZS53 aWR0aDsKKyAgICAgICAgcmVzdWx0LnNpemUud2lkdGggPSBuZXdXaWR0aDsKKyAgICAgICAgcmVz dWx0Lm9yaWdpbi54IC09IGRpZmYgLyAyOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIENHRmxvYXQg bmV3SGVpZ2h0ID0gZnJhbWVUb0NvbnN0cmFpbi0+c2l6ZS53aWR0aCAvIG9yaWdpbmFsUmF0aW87 Ci0gICAgICAgIENHRmxvYXQgZGlmZiA9IGZyYW1lVG9Db25zdHJhaW4tPnNpemUuaGVpZ2h0IC0g bmV3SGVpZ2h0OwotICAgICAgICBmcmFtZVRvQ29uc3RyYWluLT5zaXplLmhlaWdodCA9IG5ld0hl aWdodDsKLSAgICAgICAgZnJhbWVUb0NvbnN0cmFpbi0+b3JpZ2luLnkgKz0gZGlmZiAvIDI7Ci0g ICAgfSAgICAKKyAgICAgICAgQ0dGbG9hdCBuZXdIZWlnaHQgPSBmcmFtZVRvRXhwYW5kLnNpemUu d2lkdGggLyBuZXdSYXRpbzsKKyAgICAgICAgQ0dGbG9hdCBkaWZmID0gbmV3SGVpZ2h0IC0gZnJh bWVUb0V4cGFuZC5zaXplLmhlaWdodDsKKyAgICAgICAgcmVzdWx0LnNpemUuaGVpZ2h0ID0gbmV3 SGVpZ2h0OworICAgICAgICByZXN1bHQub3JpZ2luLnkgLT0gZGlmZiAvIDI7CisgICAgfQorICAg IHJldHVybiByZXN1bHQ7CiB9CiAKIHN0YXRpYyBOU1dpbmRvdyAqY3JlYXRlQmFja2dyb3VuZEZ1 bGxzY3JlZW5XaW5kb3coTlNSZWN0IGZyYW1lLCBpbnQgbGV2ZWwpCkBAIC0yNzcsOSArMjc5LDgg QEAgLSAodm9pZCllbnRlckZ1bGxzY3JlZW46KE5TU2NyZWVuICopc2NyZWVuCiAgICAgaWYgKCFz Y3JlZW4pCiAgICAgICAgIHNjcmVlbiA9IFtOU1NjcmVlbiBtYWluU2NyZWVuXTsKIAotICAgIE5T UmVjdCBmcmFtZSA9IFtzZWxmIHZpZGVvRWxlbWVudFJlY3RdOwogICAgIE5TUmVjdCBlbmRGcmFt ZSA9IFtzY3JlZW4gZnJhbWVdOwotICAgIGNvbnN0cmFpbkZyYW1lVG9SYXRpb09mRnJhbWUoJmVu ZEZyYW1lLCAmZnJhbWUpOworICAgIE5TUmVjdCBmcmFtZSA9IGZyYW1lRXhwYW5kZWRUb1JhdGlv T2ZGcmFtZShbc2VsZiB2aWRlb0VsZW1lbnRSZWN0XSwgZW5kRnJhbWUpOwogCiAgICAgLy8gQ3Jl YXRlIGEgYmxhY2sgd2luZG93IGlmIG5lZWRlZAogICAgIGlmICghX2JhY2tncm91bmRGdWxsc2Ny ZWVuV2luZG93KQpAQCAtMzE2LDggKzMxNywxMSBAQCAtICh2b2lkKWV4aXRGdWxsc2NyZWVuCiAg ICAgLy8gSWYgb3VyIG93bmVyIHJlbGVhc2VzIHVzIHdlIGNvdWxkIGNyYXNoIGlmIHRoaXMgaXMg bm90IHRoZSBjYXNlLgogICAgIC8vIEJhbGFuY2VkIGluIHdpbmRvd0RpZEV4aXRGdWxsc2NyZWVu CiAgICAgW3NlbGYgcmV0YWluXTsgICAgCi0gICAgCi0gICAgW1tzZWxmIGZ1bGxzY3JlZW5XaW5k b3ddIGFuaW1hdGVGcm9tUmVjdDpbW3NlbGYgd2luZG93XSBmcmFtZV0gdG9SZWN0OmVuZEZyYW1l IHdpdGhTdWJBbmltYXRpb246X2ZhZGVBbmltYXRpb24gY29udHJvbGxlckFjdGlvbjpAc2VsZWN0 b3Iod2luZG93RGlkRXhpdEZ1bGxzY3JlZW4pXTsKKworICAgIE5TUmVjdCBzdGFydEZyYW1lID0g W1tzZWxmIHdpbmRvd10gZnJhbWVdOworICAgIGVuZEZyYW1lID0gZnJhbWVFeHBhbmRlZFRvUmF0 aW9PZkZyYW1lKGVuZEZyYW1lLCBzdGFydEZyYW1lKTsKKworICAgIFtbc2VsZiBmdWxsc2NyZWVu V2luZG93XSBhbmltYXRlRnJvbVJlY3Q6c3RhcnRGcmFtZSB0b1JlY3Q6ZW5kRnJhbWUgd2l0aFN1 YkFuaW1hdGlvbjpfZmFkZUFuaW1hdGlvbiBjb250cm9sbGVyQWN0aW9uOkBzZWxlY3Rvcih3aW5k b3dEaWRFeGl0RnVsbHNjcmVlbildOwogfQogCiAtICh2b2lkKWFwcGxpY2F0aW9uRGlkQ2hhbmdl U2NyZWVuUGFyYW1ldGVyczooTlNOb3RpZmljYXRpb24qKW5vdGlmaWNhdGlvbgpAQCAtNTA0LDcg KzUwOCw3IEBAIC0gKHZvaWQpYW5pbWF0ZUZyb21SZWN0OihOU1JlY3Qpc3RhcnRSZWN0IHRvUmVj dDooTlNSZWN0KWVuZFJlY3Qgd2l0aFN1YkFuaW1hdGlvCiAgICAgaWYgKCF3YXNBbmltYXRpbmcp IHsKICAgICAgICAgLy8gV2UnbGwgZG93bnNjYWxlIHRoZSB3aW5kb3cgZHVyaW5nIHRoZSBhbmlt YXRpb24gYmFzZWQgb24gdGhlIGhpZ2hlciByZXNvbHV0aW9uIHJlY3QKICAgICAgICAgQk9PTCBo aWdoZXJSZXNvbHV0aW9uSXNFbmRSZWN0ID0gc3RhcnRSZWN0LnNpemUud2lkdGggPCBlbmRSZWN0 LnNpemUud2lkdGggJiYgc3RhcnRSZWN0LnNpemUuaGVpZ2h0IDwgZW5kUmVjdC5zaXplLmhlaWdo dDsKLSAgICAgICAgW3NlbGYgc2V0RnJhbWU6aGlnaGVyUmVzb2x1dGlvbklzRW5kUmVjdCA/IGVu ZFJlY3QgOiBzdGFydFJlY3QgZGlzcGxheTpOT107ICAgICAgICAKKyAgICAgICAgW3NlbGYgc2V0 RnJhbWU6aGlnaGVyUmVzb2x1dGlvbklzRW5kUmVjdCA/IGVuZFJlY3QgOiBzdGFydFJlY3QgZGlz cGxheTpOT107CiAgICAgfQogICAgIAogICAgIEFTU0VSVCghX2Z1bGxzY3JlZW5BbmltYXRpb24p Owo=