89145 2012-06-14 18:08:44 -0700 [chromium] GraphicsLayerChromium should use WebContentLayer directly 2012-06-18 16:41:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth cc-bugs dglazkov enne fishd piman tkent+wkapi webkit.review.bot oldest_to_newest 649696 0 jamesr 2012-06-14 18:08:44 -0700 [chromium] GraphicsLayerChromium should use WebContentLayer directly 649698 1 147695 jamesr 2012-06-14 18:11:18 -0700 Created attachment 147695 Patch 649700 2 jamesr 2012-06-14 18:11:46 -0700 I'll have to land a chromium-side patch to ui/compositor/layer.cc to avoid compile breaking chromium - that's what the WEBCONTENTLAYERCLIENT_HAS_OPAQUE #define is for. 649701 3 147695 piman 2012-06-14 18:13:56 -0700 Comment on attachment 147695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147695&action=review > Source/Platform/chromium/public/WebContentLayerClient.h:42 > + // optimizations. To be clear, that's only used if !WebLayer.opaque(), right? 649702 4 webkit.review.bot 2012-06-14 18:15:01 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 649703 5 jamesr 2012-06-14 18:15:33 -0700 (In reply to comment #3) > (From update of attachment 147695 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147695&action=review > > > Source/Platform/chromium/public/WebContentLayerClient.h:42 > > + // optimizations. > > To be clear, that's only used if !WebLayer.opaque(), right? It's ignored, right. We don't set it on opaque layers to avoid paying the overhead. 650236 6 147695 enne 2012-06-15 09:04:07 -0700 Comment on attachment 147695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147695&action=review R=me. > Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp:138 > + layer->setIsDrawable(false); Isn't that the default value? 650509 7 147695 jamesr 2012-06-15 14:26:59 -0700 Comment on attachment 147695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147695&action=review >> Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp:138 >> + layer->setIsDrawable(false); > > Isn't that the default value? Ooh, good point. This was a bad intermediate state from when I was playing with the default value - will revert before landing. 651870 8 jamesr 2012-06-18 16:41:32 -0700 Committed r120643: <http://trac.webkit.org/changeset/120643> 147695 2012-06-14 18:11:18 -0700 2012-06-15 14:26:59 -0700 Patch bug-89145-20120614181117.patch text/plain 16652 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi4xMmZlYTE3NWI5MTFkYTFmYmU5M2Q1ZDdlNzk1 ZmYzZjMyNzMwNTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNi0xNCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gR3JhcGhpY3NMYXllckNocm9taXVtIHNob3VsZCB1c2UgV2ViQ29udGVudExheWVyIGRpcmVj dGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTE0 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biBvcGFxdWUgcmVjdCBwYXJhbWV0ZXIgdG8gV2ViQ29udGVudExheWVyQ2xpZW50OjpwYWludENv bnRlbnRzKCkgZm9yIGEgY2xpZW50IHRvIChvcHRpb25hbGx5KSBwcm92aWRlCisgICAgICAgIGlu Zm9ybWF0aW9uIGFib3V0IG9wYXF1ZSBwb3J0aW9ucyBvZiB0aGUgcGFpbnRlZCByZWdpb24gZm9y IGN1bGxpbmcgb3B0aW1pemF0aW9ucy4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJD b250ZW50TGF5ZXJDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvbnRlbnRMYXllckNsaWVudCk6CisK IDIwMTItMDYtMTQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW2Nocm9taXVtXSBDZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xv YmFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggZjM1YzU4YTVhNGZhOTFkYjg5NTI2ZWU2ZjcyMDA0NTRmZjdiOTk2 OS4uNDI2N2VhMTYyYjAyNDA4YWVhNDAwZjhjNDA5MGYyMjY1ZDBmYWE4OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTE0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBHcmFwaGljc0xheWVyQ2hyb21pdW0gc2hv dWxkIHVzZSBXZWJDb250ZW50TGF5ZXIgZGlyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUG9ydHMgR3JhcGhpY3NMYXllckNocm9taXVtIChvciBt b3JlIHNwZWNpZmljYWxseSBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSkg dG8gaW1wbGVtZW50CisgICAgICAgIFdlYkNvbnRlbnRMYXllckNsaWVudCBpbnN0ZWFkIG9mIENv bnRlbnRMYXllckRlbGVnYXRlLiBJbiBhZGRpdGlvbiB0byB0aGUgbWVjaGFuaWNhbCBjaGFuZ2Vz LCB0aGlzIHJlcXVpcmVzCisgICAgICAgIGVhZ2VybHkgc2V0dGluZyBkcmF3c0NvbnRlbnQgb24g R3JhcGhpY3NMYXllckNocm9taXVtOjptX2xheWVyIHNpbmNlIFdlYkNvbnRlbnRMYXllckltcGwn cyBkZWZhdWx0IHZhbHVlIGlzCisgICAgICAgIGRpZmZlcmVudCBmcm9tIExheWVyQ2hyb21pdW0n cy4gQ292ZXJlZCBieSBhbGwgb2YgY29tcG9zaXRpbmcvCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpHcmFwaGljc0xheWVyQ2hyb21pdW0pOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRl bnRMYXllckRlbGVnYXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9wYXF1ZVJlY3RUcmFja2lu Z0NvbnRlbnRMYXllckRlbGVnYXRlOjpwYWludENvbnRlbnRzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0 ZS5oOgorICAgICAgICAoT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUpOgor CiAyMDEyLTA2LTE0ICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aWxlUmVhZGVyIGlzIGR5c2Z1bmN0aW9uYWwgaW4gZG9jdW1lbnRzIHdpdGggIm51bGwiIG9yaWdp biBzdHJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYzM1MGI3YzE0Nzc0Mzg0OWRj MDM0ZjU4MGQzY2QzNzQxZTdiMDBhMi4uZmZkZjAzMTQ5NDNiY2VhM2I2YTRmM2Y3YzU1YTEzOTk5 YTU0YzgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAx Mi0wNi0xNCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtjaHJvbWl1bV0gR3JhcGhpY3NMYXllckNocm9taXVtIHNob3VsZCB1c2UgV2ViQ29udGVudExh eWVyIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04OTE0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogc3JjL1dlYkNvbnRlbnRMYXllckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZW50TGF5ZXJJbXBsOjpwYWludENvbnRlbnRzKToKKyAgICAgICAgKiB0ZXN0cy9DQ09jY2x1 c2lvblRyYWNrZXJUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpDQ09jY2x1c2lvblRy YWNrZXJUZXN0TWFpblRocmVhZFR5cGVzOjpjcmVhdGVMYXllcik6CisgICAgICAgICogdGVzdHMv T3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LmNwcDoKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6T3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExh eWVyRGVsZWdhdGVUZXN0OjpPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRl c3QpOgorICAgICAgICAoV2ViQ29yZTo6T3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVs ZWdhdGVUZXN0OjpjYW52YXNSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRFU1RfRik6CisgICAg ICAgICogdGVzdHMvV2ViTGF5ZXJUZXN0LmNwcDoKKwogMjAxMi0wNi0xNCAgRGF2aWQgUmV2ZW1h biAgPHJldmVtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gU3ViLXBpeGVs IHRleHQgcmVuZGVyaW5nIGlzIGluY29ycmVjdGx5IHVzZWQgZm9yIFdlYlZpZXcgd2l0aCB0cmFu c3BhcmVudCBiYWNrZ3JvdW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9XZWJDb250ZW50TGF5ZXJDbGllbnQuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1 bS9wdWJsaWMvV2ViQ29udGVudExheWVyQ2xpZW50LmgKaW5kZXggZGViMzZlMDc3ZDE5MDMzYjY0 YTJjOWU4ZWQ0MDFjMDNhZmJjYTY2My4uNTNmNWMwYTgyODFiZTQ3Nzk3NTRkY2M2MWY4NzU5NzE0 Y2MzODk5YSAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJD b250ZW50TGF5ZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYkNvbnRlbnRMYXllckNsaWVudC5oCkBAIC0zNyw3ICszNywxMSBAQCBwdWJsaWM6CiAgICAg Ly8gdGhyb3VnaCBXZWJDb250ZW50TGF5ZXI6OnNldE5lZWRzRGlzcGxheSwgc3VibWl0dGluZyBk cmF3aW5nIGNvbW1hbmRzCiAgICAgLy8gdGhyb3VnaCB0aGUgV2ViQ2FudmFzLgogICAgIC8vIFRo ZSBjYW52YXMgaXMgYWxyZWFkeSBjbGlwcGVkIHRvIHRoZSB8Y2xpcHwgcmVjdC4KLSAgICB2aXJ0 dWFsIHZvaWQgcGFpbnRDb250ZW50cyhXZWJDYW52YXMqLCBjb25zdCBXZWJSZWN0JiBjbGlwKSA9 IDA7CisgICAgLy8gT3B0aW9uYWxseSwgdGhlIGltcGxlbWVudGF0aW9uIG1heSBzZXQgfG9wYXF1 ZXwgdG8gYSByZWN0IGNvdmVyaW5nIHBpeGVscyB0aGF0CisgICAgLy8gdGhlIGltcGxlbWVudGF0 aW9uIGtub3dzIGFyZSBvcGFxdWUuIFRoaXMgaW5mb3JtYXRpb24gY2FuIGJlIHVzZWQgZm9yIHZh cmlvdXMKKyAgICAvLyBvcHRpbWl6YXRpb25zLgorI2RlZmluZSBXRUJDT05URU5UTEFZRVJDTElF TlRfSEFTX09QQVFVRSAxCisgICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVudHMoV2ViQ2FudmFz KiwgY29uc3QgV2ViUmVjdCYgY2xpcCwgV2ViUmVjdCYgb3BhcXVlKSA9IDA7CiAKIHByb3RlY3Rl ZDoKICAgICB2aXJ0dWFsIH5XZWJDb250ZW50TGF5ZXJDbGllbnQoKSB7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9H cmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDg2YTFmMzI5OTZjNmI2ZTFlNmU1NGYwYzMz OWU4M2JhMjEyMGE5MWUuLjE4ZWM1ZDFiYTljYzA4MjQ2OGNiM2Y5MGZjM2U0MDI5MTZiZDVmMGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dy YXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcApAQCAtOTAsNyArOTAsOCBA QCBHcmFwaGljc0xheWVyQ2hyb21pdW06OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bShHcmFwaGljc0xh eWVyQ2xpZW50KiBjbGllbnQpCiAgICAgLCBtX3BhZ2VTY2FsZUNoYW5nZWQoZmFsc2UpCiB7CiAg ICAgbV9vcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSA9IGFkb3B0UHRyKG5l dyBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSh0aGlzKSk7Ci0gICAgbV9s YXllciA9IFdlYkNvbnRlbnRMYXllcihDb250ZW50TGF5ZXJDaHJvbWl1bTo6Y3JlYXRlKG1fb3Bh cXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuZ2V0KCkpKTsKKyAgICBtX2xheWVy ID0gV2ViQ29udGVudExheWVyOjpjcmVhdGUobV9vcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5 ZXJEZWxlZ2F0ZS5nZXQoKSk7CisgICAgbV9sYXllci5zZXREcmF3c0NvbnRlbnQobV9kcmF3c0Nv bnRlbnQgJiYgbV9jb250ZW50c1Zpc2libGUpOwogCiAgICAgdXBkYXRlRGVidWdJbmRpY2F0b3Jz KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250 ZW50TGF5ZXJEZWxlZ2F0ZS5jcHAKaW5kZXggMWI2MTk2NmI5NWRkOTEwM2JlMzMyYWNjNTYxOWU5 M2U2OWNhYjQzYS4uZTlmNTA4ZWRlM2Y0YjljNDE3Mjc0OTM5MGJmY2NlYjJjNTkzNWIwMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3BhcXVl UmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXll ckRlbGVnYXRlLmNwcApAQCAtMzEsNiArMzEsOSBAQAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4 dC5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lh LmgiCisjaW5jbHVkZSA8cHVibGljL1dlYlJlY3QuaD4KKwordXNpbmcgV2ViS2l0OjpXZWJSZWN0 OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQ0LDEzICs0NywxMyBAQCBPcGFxdWVSZWN0 VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZTo6fk9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRM YXllckRlbGVnYXRlKAogewogfQogCi12b2lkIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXll ckRlbGVnYXRlOjpwYWludENvbnRlbnRzKFNrQ2FudmFzKiBjYW52YXMsIGNvbnN0IEludFJlY3Qm IGNsaXAsIEludFJlY3QmIG9wYXF1ZSkKK3ZvaWQgT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExh eWVyRGVsZWdhdGU6OnBhaW50Q29udGVudHMoU2tDYW52YXMqIGNhbnZhcywgY29uc3QgV2ViUmVj dCYgY2xpcCwgV2ViUmVjdCYgb3BhcXVlKQogewogICAgIFBsYXRmb3JtQ29udGV4dFNraWEgcGxh dGZvcm1Db250ZXh0KGNhbnZhcyk7CiAgICAgcGxhdGZvcm1Db250ZXh0LnNldFRyYWNrT3BhcXVl UmVnaW9uKCFtX29wYXF1ZSk7CiAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoJnBsYXRmb3Jt Q29udGV4dCk7CiAKLSAgICBjb250ZXh0LmNsZWFyUmVjdChjbGlwKTsKKyAgICBjb250ZXh0LmNs ZWFyUmVjdChGbG9hdFJlY3QoY2xpcCkpOwogICAgIGNvbnRleHQuY2xpcChjbGlwKTsKIAogICAg IC8vIFJlY29yZCB0cmFuc2Zvcm0gcHJpb3IgdG8gcGFpbnRpbmcsIGFzIGFsbCBvcGFxdWUgdHJh Y2tpbmcgd2lsbCBiZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL09wYXF1ZVJlY3RUcmFja2lu Z0NvbnRlbnRMYXllckRlbGVnYXRlLmgKaW5kZXggMWM1M2QxZDI5ZGVmOTI1NzMyOGY0MTRhZDJj NzU3MDVkZjRlM2E2Yy4uZTMyNWIzNmUxZmQ5NDhmMzNiMWRiNGZhMzI4YTc1MDg2ZTkyMzNiOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vT3Bh cXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5 ZXJEZWxlZ2F0ZS5oCkBAIC0yNSw3ICsyNSw4IEBACiAjaWZuZGVmIE9wYXF1ZVJlY3RUcmFja2lu Z0NvbnRlbnRMYXllckRlbGVnYXRlX2gKICNkZWZpbmUgT3BhcXVlUmVjdFRyYWNraW5nQ29udGVu dExheWVyRGVsZWdhdGVfaAogCi0jaW5jbHVkZSAiQ29udGVudExheWVyQ2hyb21pdW0uaCIKKyNp bmNsdWRlIDxwdWJsaWMvV2ViQ29udGVudExheWVyQ2xpZW50Lmg+CisjaW5jbHVkZSA8d3RmL05v bmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogY2xhc3MgU2tDYW52 YXM7CkBAIC00Myw3ICs0NCw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5HcmFwaGljc0Nv bnRleHRQYWludGVyKCkgeyB9CiB9OwogCi1jbGFzcyBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50 TGF5ZXJEZWxlZ2F0ZSA6IHB1YmxpYyBDb250ZW50TGF5ZXJEZWxlZ2F0ZSB7CitjbGFzcyBPcGFx dWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSA6IHB1YmxpYyBXZWJLaXQ6OldlYkNv bnRlbnRMYXllckNsaWVudCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoT3BhcXVlUmVjdFRy YWNraW5nQ29udGVudExheWVyRGVsZWdhdGUpOwogcHVibGljOgogICAgIGV4cGxpY2l0IE9wYXF1 ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlKEdyYXBoaWNzQ29udGV4dFBhaW50ZXIq KTsKQEAgLTUzLDggKzU0LDggQEAgcHVibGljOgogICAgIC8vIHRyYWNraW5nIG9wYXF1ZW5lc3Mu CiAgICAgdm9pZCBzZXRPcGFxdWUoYm9vbCBvcGFxdWUpIHsgbV9vcGFxdWUgPSBvcGFxdWU7IH0K IAotICAgIC8vIENvbnRlbnRMYXllckRlbGVnYXRlCi0gICAgdmlydHVhbCB2b2lkIHBhaW50Q29u dGVudHMoU2tDYW52YXMqLCBjb25zdCBJbnRSZWN0JiBjbGlwLCBJbnRSZWN0JiBvcGFxdWUpIE9W RVJSSURFOworICAgIC8vIFdlYktpdDo6V2ViQ29udGVudExheWVyQ2xpZW50IGltcGxlbWVudGF0 aW9uLgorICAgIHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKFNrQ2FudmFzKiwgY29uc3QgV2Vi S2l0OjpXZWJSZWN0JiBjbGlwLCBXZWJLaXQ6OldlYlJlY3QmIG9wYXF1ZSkgT1ZFUlJJREU7CiAK IHByaXZhdGU6CiAgICAgR3JhcGhpY3NDb250ZXh0UGFpbnRlciogbV9wYWludGVyOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ29udGVudExheWVySW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb250ZW50TGF5ZXJJbXBsLmNwcAppbmRl eCBlYzc1M2U3ZmVjODk3MDhhZDIyZTNlMjI1YzgzMTJlZGE5NWMxN2I5Li44YzgxMjJmNmI0ZWEw ZmVlY2ZhMjkxYzMzOTgxYzkzYmFiN2MxNTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJDb250ZW50TGF5ZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJDb250ZW50TGF5ZXJJbXBsLmNwcApAQCAtNTMsMTEgKzUzLDEzIEBAIFdl YkNvbnRlbnRMYXllckltcGw6On5XZWJDb250ZW50TGF5ZXJJbXBsKCkKICAgICBjbGVhckRlbGVn YXRlKCk7CiB9CiAKLXZvaWQgV2ViQ29udGVudExheWVySW1wbDo6cGFpbnRDb250ZW50cyhTa0Nh bnZhcyogY2FudmFzLCBjb25zdCBJbnRSZWN0JiBjbGlwLCBJbnRSZWN0JikKK3ZvaWQgV2ViQ29u dGVudExheWVySW1wbDo6cGFpbnRDb250ZW50cyhTa0NhbnZhcyogY2FudmFzLCBjb25zdCBJbnRS ZWN0JiBjbGlwLCBJbnRSZWN0JiBvcGFxdWUpCiB7CiAgICAgaWYgKCFtX2NvbnRlbnRDbGllbnQp CiAgICAgICAgIHJldHVybjsKLSAgICBtX2NvbnRlbnRDbGllbnQtPnBhaW50Q29udGVudHMoY2Fu dmFzLCBXZWJSZWN0KGNsaXApKTsKKyAgICBXZWJSZWN0IHdlYk9wYXF1ZTsKKyAgICBtX2NvbnRl bnRDbGllbnQtPnBhaW50Q29udGVudHMoY2FudmFzLCBXZWJSZWN0KGNsaXApLCB3ZWJPcGFxdWUp OworICAgIG9wYXF1ZSA9IHdlYk9wYXF1ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tl clRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNr ZXJUZXN0LmNwcAppbmRleCBhNjQ5NjVmMTZlMmEwNThhODFkNTdiZmQ0MWFmZTFhNTZkMGJkYmI1 Li5hMTc3MjY0MDdiYTRiYjVlY2EyMTU5YWUxNmVmMTdkMmFhMjNkNDM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5j cHAKQEAgLTEzMiw3ICsxMzIsMTIgQEAgc3RydWN0IENDT2NjbHVzaW9uVHJhY2tlclRlc3RNYWlu VGhyZWFkVHlwZXMgewogICAgIHR5cGVkZWYgQ0NMYXllckl0ZXJhdG9yPExheWVyQ2hyb21pdW0s IFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiwgUmVuZGVyU3VyZmFjZUNocm9taXVtLCBD Q0xheWVySXRlcmF0b3JBY3Rpb25zOjpGcm9udFRvQmFjaz4gTGF5ZXJJdGVyYXRvcjsKICAgICB0 eXBlZGVmIENDT2NjbHVzaW9uVHJhY2tlciBPY2NsdXNpb25UcmFja2VyVHlwZTsKIAotICAgIHN0 YXRpYyBQYXNzTGF5ZXJQdHJUeXBlIGNyZWF0ZUxheWVyKCkgeyByZXR1cm4gTGF5ZXJDaHJvbWl1 bTo6Y3JlYXRlKCk7IH0KKyAgICBzdGF0aWMgUGFzc0xheWVyUHRyVHlwZSBjcmVhdGVMYXllcigp CisgICAgeworICAgICAgICBSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gbGF5ZXIgPSBMYXllckNocm9t aXVtOjpjcmVhdGUoKTsKKyAgICAgICAgbGF5ZXItPnNldElzRHJhd2FibGUoZmFsc2UpOworICAg ICAgICByZXR1cm4gbGF5ZXIucmVsZWFzZSgpOworICAgIH0KICAgICBzdGF0aWMgUGFzc0NvbnRl bnRMYXllclB0clR5cGUgY3JlYXRlQ29udGVudExheWVyKCkgeyByZXR1cm4gYWRvcHRSZWYobmV3 IENvbnRlbnRMYXllclR5cGUoKSk7IH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0 LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvT3BhcXVlUmVjdFRyYWNraW5nQ29u dGVudExheWVyRGVsZWdhdGVUZXN0LmNwcAppbmRleCAxNzhhZTk1NWNjNjM0YzAyZGM3OWRjMzFi NTlkNWU4MzdjM2ZiNTA2Li5kZDYwYTk3YjdhMTNhNTlhYmNiMmViOTdmOTliODE1NDgxNjZhNDFj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL09wYXF1ZVJlY3RUcmFj a2luZ0NvbnRlbnRMYXllckRlbGVnYXRlVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9PcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QuY3Bw CkBAIC0yNywxMCArMjcsMTQgQEAKICNpbmNsdWRlICJPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50 TGF5ZXJEZWxlZ2F0ZS5oIgogCiAjaW5jbHVkZSAiQ29sb3IuaCIKKyNpbmNsdWRlICJHcmFwaGlj c0NvbnRleHQuaCIKKyNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAic2tpYS9leHQvcGxh dGZvcm1fY2FudmFzLmgiCisjaW5jbHVkZSA8cHVibGljL1dlYlJlY3QuaD4KIAogI2luY2x1ZGUg PGd0ZXN0L2d0ZXN0Lmg+CiAKK3VzaW5nIFdlYktpdDo6V2ViUmVjdDsKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgewpAQCAtOTUsMjAgKzk5LDIwIEBAIHN0cnVjdCBQYWlu dEZpbGxQYXJ0aWFsT3BhcXVlIDogcHVibGljIFBhaW50Q2FsbGJhY2sgewogfTsKIAogI2RlZmlu ZSBFWFBFQ1RfRVFfUkVDVChhLCBiKSBcCi0gICAgRVhQRUNUX0VRKGEueCgpLCBiLngoKSk7IFwK LSAgICBFWFBFQ1RfRVEoYS5tYXhYKCksIGIubWF4WCgpKTsgXAotICAgIEVYUEVDVF9FUShhLnko KSwgYi55KCkpOyBcCi0gICAgRVhQRUNUX0VRKGEubWF4WSgpLCBiLm1heFkoKSk7CisgICAgRVhQ RUNUX0VRKGEueCwgYi54KTsgXAorICAgIEVYUEVDVF9FUShhLndpZHRoLCBiLndpZHRoKTsgXAor ICAgIEVYUEVDVF9FUShhLnksIGIueSk7IFwKKyAgICBFWFBFQ1RfRVEoYS5oZWlnaHQsIGIuaGVp Z2h0KTsKIAogY2xhc3MgT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0 IDogcHVibGljIHRlc3Rpbmc6OlRlc3QgewogcHVibGljOgogICAgIE9wYXF1ZVJlY3RUcmFja2lu Z0NvbnRlbnRMYXllckRlbGVnYXRlVGVzdCgpCi0gICAgICAgIDogbV9za0NhbnZhcyhhZG9wdFB0 cihza2lhOjpDcmVhdGVCaXRtYXBDYW52YXMoY2FudmFzUmVjdCgpLndpZHRoKCksIGNhbnZhc1Jl Y3QoKS5oZWlnaHQoKSwgZmFsc2UpKSkKKyAgICAgICAgOiBtX3NrQ2FudmFzKGFkb3B0UHRyKHNr aWE6OkNyZWF0ZUJpdG1hcENhbnZhcyhjYW52YXNSZWN0KCkud2lkdGgsIGNhbnZhc1JlY3QoKS5o ZWlnaHQsIGZhbHNlKSkpCiAgICAgewogICAgIH0KIAogICAgIFNrQ2FudmFzKiBza0NhbnZhcygp IHsgcmV0dXJuIG1fc2tDYW52YXMuZ2V0KCk7IH0KLSAgICBJbnRSZWN0IGNhbnZhc1JlY3QoKSB7 IHJldHVybiBJbnRSZWN0KDAsIDAsIDQwMCwgNDAwKTsgfQorICAgIFdlYlJlY3QgY2FudmFzUmVj dCgpIHsgcmV0dXJuIFdlYlJlY3QoMCwgMCwgNDAwLCA0MDApOyB9CiAKIHByaXZhdGU6CiAgICAg T3duUHRyPFNrQ2FudmFzPiBtX3NrQ2FudmFzOwpAQCAtMTIxLDkgKzEyNSw5IEBAIFRFU1RfRihP cGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QsIHRlc3RPcGFxdWVSZWN0 UHJlc2VudEFmdGVyT3BhCiAKICAgICBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxl Z2F0ZSBkZWxlZ2F0ZSgmcGFpbnRlcik7CiAKLSAgICBJbnRSZWN0IG9wYXF1ZVJlY3Q7CisgICAg V2ViUmVjdCBvcGFxdWVSZWN0OwogICAgIGRlbGVnYXRlLnBhaW50Q29udGVudHMoc2tDYW52YXMo KSwgY2FudmFzUmVjdCgpLCBvcGFxdWVSZWN0KTsKLSAgICBFWFBFQ1RfRVFfUkVDVChJbnRSZWN0 KDAsIDAsIDQwMCwgNDAwKSwgb3BhcXVlUmVjdCk7CisgICAgRVhQRUNUX0VRX1JFQ1QoV2ViUmVj dCgwLCAwLCA0MDAsIDQwMCksIG9wYXF1ZVJlY3QpOwogfQogCiBURVNUX0YoT3BhcXVlUmVjdFRy YWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LCB0ZXN0T3BhcXVlUmVjdE5vdFByZXNlbnRB ZnRlck5vbk9wYXF1ZVBhaW50KQpAQCAtMTMyLDkgKzEzNiw5IEBAIFRFU1RfRihPcGFxdWVSZWN0 VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QsIHRlc3RPcGFxdWVSZWN0Tm90UHJlc2Vu dEFmdGVyCiAgICAgVGVzdExheWVyUGFpbnRlckNocm9taXVtIHBhaW50ZXIoZmlsbEFscGhhKTsK ICAgICBPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZSBkZWxlZ2F0ZSgmcGFp bnRlcik7CiAKLSAgICBJbnRSZWN0IG9wYXF1ZVJlY3Q7CisgICAgV2ViUmVjdCBvcGFxdWVSZWN0 OwogICAgIGRlbGVnYXRlLnBhaW50Q29udGVudHMoc2tDYW52YXMoKSwgY2FudmFzUmVjdCgpLCBv cGFxdWVSZWN0KTsKLSAgICBFWFBFQ1RfRVFfUkVDVChJbnRSZWN0KDAsIDAsIDAsIDApLCBvcGFx dWVSZWN0KTsKKyAgICBFWFBFQ1RfRVFfUkVDVChXZWJSZWN0KDAsIDAsIDAsIDApLCBvcGFxdWVS ZWN0KTsKIH0KIAogVEVTVF9GKE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRl VGVzdCwgdGVzdE9wYXF1ZVJlY3ROb3RQcmVzZW50Rm9yT3BhcXVlTGF5ZXJXaXRoT3BhcXVlUGFp bnQpCkBAIC0xNDUsOSArMTQ5LDkgQEAgVEVTVF9GKE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRM YXllckRlbGVnYXRlVGVzdCwgdGVzdE9wYXF1ZVJlY3ROb3RQcmVzZW50Rm9yT3AKIAogICAgIGRl bGVnYXRlLnNldE9wYXF1ZSh0cnVlKTsKIAotICAgIEludFJlY3Qgb3BhcXVlUmVjdDsKKyAgICBX ZWJSZWN0IG9wYXF1ZVJlY3Q7CiAgICAgZGVsZWdhdGUucGFpbnRDb250ZW50cyhza0NhbnZhcygp LCBjYW52YXNSZWN0KCksIG9wYXF1ZVJlY3QpOwotICAgIEVYUEVDVF9FUV9SRUNUKEludFJlY3Qo MCwgMCwgMCwgMCksIG9wYXF1ZVJlY3QpOworICAgIEVYUEVDVF9FUV9SRUNUKFdlYlJlY3QoMCwg MCwgMCwgMCksIG9wYXF1ZVJlY3QpOwogfQogCiBURVNUX0YoT3BhcXVlUmVjdFRyYWNraW5nQ29u dGVudExheWVyRGVsZWdhdGVUZXN0LCB0ZXN0T3BhcXVlUmVjdE5vdFByZXNlbnRGb3JPcGFxdWVM YXllcldpdGhOb25PcGFxdWVQYWludCkKQEAgLTE1OCw5ICsxNjIsOSBAQCBURVNUX0YoT3BhcXVl UmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGVUZXN0LCB0ZXN0T3BhcXVlUmVjdE5vdFBy ZXNlbnRGb3JPcAogCiAgICAgZGVsZWdhdGUuc2V0T3BhcXVlKHRydWUpOwogCi0gICAgSW50UmVj dCBvcGFxdWVSZWN0OworICAgIFdlYlJlY3Qgb3BhcXVlUmVjdDsKICAgICBkZWxlZ2F0ZS5wYWlu dENvbnRlbnRzKHNrQ2FudmFzKCksIGNhbnZhc1JlY3QoKSwgb3BhcXVlUmVjdCk7Ci0gICAgRVhQ RUNUX0VRX1JFQ1QoSW50UmVjdCgwLCAwLCAwLCAwKSwgb3BhcXVlUmVjdCk7CisgICAgRVhQRUNU X0VRX1JFQ1QoV2ViUmVjdCgwLCAwLCAwLCAwKSwgb3BhcXVlUmVjdCk7CiB9CiAKIFRFU1RfRihP cGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QsIHRlc3RQYXJ0aWFsT3Bh cXVlUmVjdE5vVHJhbnNmb3JtKQpAQCAtMTcwLDkgKzE3NCw5IEBAIFRFU1RfRihPcGFxdWVSZWN0 VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3QsIHRlc3RQYXJ0aWFsT3BhcXVlUmVjdE5v VHJhbnNmCiAgICAgVGVzdExheWVyUGFpbnRlckNocm9taXVtIHBhaW50ZXIoZmlsbFBhcnRpYWwp OwogICAgIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlIGRlbGVnYXRlKCZw YWludGVyKTsKIAotICAgIEludFJlY3Qgb3BhcXVlUmVjdDsKKyAgICBXZWJSZWN0IG9wYXF1ZVJl Y3Q7CiAgICAgZGVsZWdhdGUucGFpbnRDb250ZW50cyhza0NhbnZhcygpLCBjYW52YXNSZWN0KCks IG9wYXF1ZVJlY3QpOwotICAgIEVYUEVDVF9FUV9SRUNUKHBhcnRpYWxSZWN0LCBvcGFxdWVSZWN0 KTsKKyAgICBFWFBFQ1RfRVFfUkVDVChXZWJSZWN0KHBhcnRpYWxSZWN0LngoKSwgcGFydGlhbFJl Y3QueSgpLCBwYXJ0aWFsUmVjdC53aWR0aCgpLCBwYXJ0aWFsUmVjdC5oZWlnaHQoKSksIG9wYXF1 ZVJlY3QpOwogfQogCiBURVNUX0YoT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdh dGVUZXN0LCB0ZXN0UGFydGlhbE9wYXF1ZVJlY3RUcmFuc2xhdGlvbikKQEAgLTE4MiwxMCArMTg2 LDEwIEBAIFRFU1RfRihPcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0ZVRlc3Qs IHRlc3RQYXJ0aWFsT3BhcXVlUmVjdFRyYW5zbGF0CiAgICAgVGVzdExheWVyUGFpbnRlckNocm9t aXVtIHBhaW50ZXIoZmlsbFBhcnRpYWwpOwogICAgIE9wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRM YXllckRlbGVnYXRlIGRlbGVnYXRlKCZwYWludGVyKTsKIAotICAgIEludFJlY3Qgb3BhcXVlUmVj dDsKLSAgICBJbnRSZWN0IGNvbnRlbnRSZWN0KDExLCAxMiwgMzg5LCAzODgpOworICAgIFdlYlJl Y3Qgb3BhcXVlUmVjdDsKKyAgICBXZWJSZWN0IGNvbnRlbnRSZWN0KDExLCAxMiwgMzg5LCAzODgp OwogICAgIGRlbGVnYXRlLnBhaW50Q29udGVudHMoc2tDYW52YXMoKSwgY29udGVudFJlY3QsIG9w YXF1ZVJlY3QpOwotICAgIEVYUEVDVF9FUV9SRUNUKHBhcnRpYWxSZWN0LCBvcGFxdWVSZWN0KTsK KyAgICBFWFBFQ1RfRVFfUkVDVChXZWJSZWN0KHBhcnRpYWxSZWN0LngoKSwgcGFydGlhbFJlY3Qu eSgpLCBwYXJ0aWFsUmVjdC53aWR0aCgpLCBwYXJ0aWFsUmVjdC5oZWlnaHQoKSksIG9wYXF1ZVJl Y3QpOwogfQogCiB9IC8vIG5hbWVzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9XZWJMYXllclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9XZWJMYXllclRlc3QuY3BwCmluZGV4IDhmYzdjOTNiZGQ1OTlmNTc4Y2I0ZDhiMGU1YTNhZDE4 ZDk1YWRkN2UuLmJjNDkyOTMxMWUzMmI0N2E5N2EwZjBmYTliNWRhNGE0Y2NhYjYxZjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViTGF5ZXJUZXN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkxheWVyVGVzdC5jcHAKQEAgLTY1LDcg KzY1LDcgQEAgcHVibGljOgogCiBjbGFzcyBNb2NrV2ViQ29udGVudExheWVyQ2xpZW50IDogcHVi bGljIFdlYkNvbnRlbnRMYXllckNsaWVudCB7CiBwdWJsaWM6Ci0gICAgTU9DS19NRVRIT0QyKHBh aW50Q29udGVudHMsIHZvaWQoV2ViQ2FudmFzKiwgY29uc3QgV2ViUmVjdCYgY2xpcCkpOworICAg IE1PQ0tfTUVUSE9EMyhwYWludENvbnRlbnRzLCB2b2lkKFdlYkNhbnZhcyosIGNvbnN0IFdlYlJl Y3QmIGNsaXAsIFdlYlJlY3QmIG9wYXF1ZSkpOwogfTsKIAogY2xhc3MgV2ViTGF5ZXJUZXN0IDog cHVibGljIFRlc3QgewpAQCAtMTc1LDcgKzE3NSw3IEBAIFRFU1RfRihXZWJMYXllclRlc3QsIENs aWVudCkKIAogICAgIC8vIENvbnRlbnQgbGF5ZXIuCiAgICAgTW9ja1dlYkNvbnRlbnRMYXllckNs aWVudCBjb250ZW50Q2xpZW50OwotICAgIEVYUEVDVF9DQUxMKGNvbnRlbnRDbGllbnQsIHBhaW50 Q29udGVudHMoXywgXykpLlRpbWVzKEFueU51bWJlcigpKTsKKyAgICBFWFBFQ1RfQ0FMTChjb250 ZW50Q2xpZW50LCBwYWludENvbnRlbnRzKF8sIF8sIF8pKS5UaW1lcyhBbnlOdW1iZXIoKSk7CiAg ICAgRVhQRUNUX0NBTEwobV9jbGllbnQsIHNjaGVkdWxlQ29tcG9zaXRlKCkpLlRpbWVzKEFueU51 bWJlcigpKTsKICAgICBXZWJDb250ZW50TGF5ZXIgY29udGVudExheWVyID0gV2ViQ29udGVudExh eWVyOjpjcmVhdGUoJmNvbnRlbnRDbGllbnQpOwogICAgIG1fcm9vdExheWVyLmFkZENoaWxkKGNv bnRlbnRMYXllcik7CkBAIC0yMDksNyArMjA5LDcgQEAgVEVTVF9GKFdlYkxheWVyVGVzdCwgSGll cmFyY2h5KQogICAgIEVYUEVDVF9UUlVFKGxheWVyMi5wYXJlbnQoKS5pc051bGwoKSk7CiAKICAg ICBNb2NrV2ViQ29udGVudExheWVyQ2xpZW50IGNvbnRlbnRDbGllbnQ7Ci0gICAgRVhQRUNUX0NB TEwoY29udGVudENsaWVudCwgcGFpbnRDb250ZW50cyhfLCBfKSkuVGltZXMoQW55TnVtYmVyKCkp OworICAgIEVYUEVDVF9DQUxMKGNvbnRlbnRDbGllbnQsIHBhaW50Q29udGVudHMoXywgXywgXykp LlRpbWVzKEFueU51bWJlcigpKTsKICAgICBXZWJDb250ZW50TGF5ZXIgY29udGVudExheWVyID0g V2ViQ29udGVudExheWVyOjpjcmVhdGUoJmNvbnRlbnRDbGllbnQpOwogICAgIFdlYkV4dGVybmFs VGV4dHVyZUxheWVyIHRleHR1cmVMYXllciA9IFdlYkV4dGVybmFsVGV4dHVyZUxheWVyOjpjcmVh dGUoKTsKIAo=