60982 2011-05-17 13:31:16 -0700 Exiting full screen will leave up invisible full-screen window, blocking all mouse clicks. 2011-05-17 23:16:37 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble oldest_to_newest 405260 0 jer.noble 2011-05-17 13:31:16 -0700 Exiting full screen will leave up invisible full-screen window, blocking all mouse clicks. 405266 1 93811 jer.noble 2011-05-17 13:47:05 -0700 Created attachment 93811 Patch 405267 2 jer.noble 2011-05-17 13:47:19 -0700 <rdar://problem/9455104> 405434 3 93811 darin 2011-05-17 18:15:27 -0700 Comment on attachment 93811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93811&action=review > Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:138 > + if (m_rootLayer && m_rootLayer->children().contains(layer)) > return; Seems a little silly to search the root layer for a layer of 0 when this is called with 0. This check could go after the !layer check. 405530 4 jer.noble 2011-05-17 23:16:37 -0700 Committed r86738: <http://trac.webkit.org/changeset/86738> 93811 2011-05-17 13:47:05 -0700 2011-05-17 18:15:26 -0700 Patch bug-60982-20110517134704.patch text/plain 9814 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODY2NTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAyNmE0YjkyMWIyYTUyMzFm ZDc5ZDYwNjE2MzZjM2FhYmFmOTBjM2FmLi42MjZjNGVhNTlkYWJiZmEyMmYwMjllMjk0YmFkZmJh OTMwZmFmY2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDUtMTcgIEplcmVt eSBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRXhpdGluZyBmdWxsIHNjcmVlbiB3aWxsIGxlYXZlIHVw IGludmlzaWJsZSBmdWxsLXNjcmVlbiB3aW5kb3csIGJsb2NraW5nIGFsbCBtb3VzZSBjbGlja3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDk4Mgor CisgICAgICAgIFRoZSBHcmFwaGljc0xheWVyIHRyZWUgaGFzIHVucGFyZW50ZWQgbV9mdWxsU2Ny ZWVuUm9vdExheWVyIGJlaGluZCBvdXIgYmFja3MsIHJlcGxhY2luZyB0aGUgCisgICAgICAgIHRp bGVkIGxheWVyIHdpdGggYSBub3JtYWwgb25lLiAgSW5zdGVhZCBvZiBob2xkaW5nIG9uIHRvIGEg c3BlY2lmaWMgbGF5ZXIsIGFzc3VtZSB0aGF0IHRoZSAKKyAgICAgICAgd19yb290TGF5ZXIgd2ls bCBvbmx5IGhhdmUgMCBvciAxIGNoaWxkcmVuLCBhbmQgaWYgYSBjaGlsZCBpcyBwcmVzZW50LCB0 aGVuIHRoYXQgaXMgb3VyIGZ1bGwtCisgICAgICAgIHNjcmVlbiBsYXllci4KKworICAgICAgICBB ZGRpdGlvbmFsbHksIGV4cGxpY2l0bHkgc2V0IGJvdGggZW5kcyBvZiBhIHpvb20gYW5pbWF0aW9u LCBpbnN0ZWFkIG9mIGxlYXZpbmcgb25lIGVuZCBhdCAKKyAgICAgICAgQ0FUcmFuc2Zvcm0zRElk ZW50aXR5LiAgQW5kIGNoZWNrIHRvIHNlZSBpZiB0aGUgYW5pbWF0aW5nIGxheWVyJ3MgcHJlc2Vu dGF0aW9uTGF5ZXIgaXMgbmlsCisgICAgICAgIGJlZm9yZSBjYWxsaW5nIGl0OyBhc2tpbmcgYSBu aWwgb2JqZWN0IGZvciBhIENBVHJhbnNmb3JtM0Qgd2lsbCBnaXZlIGJhY2sgYSBzdHJ1Y3QgZnVs bCBvZiAKKyAgICAgICAgZ2FyYmFnZS4KKworICAgICAgICBJbiBXS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLCB3aGVuIHRoZSBleGl0IGFuaW1hdGlvbiBjb21wbGV0ZXMsIGlnbm9yZSB0aGUg ImNvbXBsZXRlZCIKKyAgICAgICAgcGFyYW1ldGVyLiAgVGhpcyBlbGltaW5hdGVzIHRoZSBwb3Nz aWJpbGl0eSB0aGF0IHRoZSBmdWxsIHNjcmVlbiB3aW5kb3cgd2lsbCBlbmQgdXAgbGVmdAorICAg ICAgICBvbiB0b3Agb2YgdGhlIHNjcmVlbiBpZiB0aGUgYW5pbWF0aW9uIGlzIGNhbmNlbGxlZCBh bmQgYSBlbnRlciBmdWxsIHNjcmVlbiBhbmltYXRpb24gaXNuJ3QKKyAgICAgICAgZm9ydGhjb21p bmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRF eGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0Z1bGxTY3Jl ZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9G dWxsU2NyZWVuL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlck1hYy5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIpOgorICAg ICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6YmVnaW5FbnRlckZ1bGxTY3Jl ZW5BbmltYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6 YmVnaW5FeGl0RnVsbFNjcmVlbkFuaW1hdGlvbik6CisKIDIwMTEtMDUtMTYgIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFRha2UgYW5vdGhlciBzaG90 IGF0IGZpeGluZyB0aGUgV2luQ2Fpcm8gYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5k ZXggYjg3MzliZjE4ZTZiYWFlZDMyYWE3ZDc2NmQzYTc2NmYzMjdhODYxYy4uYjE1YWJhY2IwM2Yx YzdlZGIzYTU4ZDBiYjdkMGE2MDFiMzY1NmFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQpA QCAtMzQwLDE1ICszNDAsMTIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKICAgICBOU0Rp c2FibGVTY3JlZW5VcGRhdGVzKCk7CiAgICAgCi0gICAgaWYgKGNvbXBsZXRlZCkgewotICAgICAg ICBbc2VsZiBfdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsU2NyZWVuXTsKLSAgICAgICAgW3NlbGYg X3VwZGF0ZVBvd2VyQXNzZXJ0aW9uc107Ci0gICAgICAgIFtOU0N1cnNvciBzZXRIaWRkZW5VbnRp bE1vdXNlTW92ZXM6WUVTXTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgW1tzZWxmIHdpbmRv d10gb3JkZXJPdXQ6c2VsZl07Ci0gICAgICAgIFtbX3dlYlZpZXcgd2luZG93XSBtYWtlS2V5QW5k T3JkZXJGcm9udDpzZWxmXTsKLSAgICB9Ci0gICAgCisgICAgW3NlbGYgX3VwZGF0ZU1lbnVBbmRE b2NrRm9yRnVsbFNjcmVlbl07CisgICAgW3NlbGYgX3VwZGF0ZVBvd2VyQXNzZXJ0aW9uc107Cisg ICAgW05TQ3Vyc29yIHNldEhpZGRlblVudGlsTW91c2VNb3ZlczpZRVNdOworICAgIFtbc2VsZiB3 aW5kb3ddIG9yZGVyT3V0OnNlbGZdOworICAgIFtbX3dlYlZpZXcgd2luZG93XSBtYWtlS2V5QW5k T3JkZXJGcm9udDpzZWxmXTsKKwogICAgIFtzZWxmIF9tYW5hZ2VyXS0+ZGlkRXhpdEZ1bGxTY3Jl ZW4oKTsKICAgICBOU0VuYWJsZVNjcmVlblVwZGF0ZXMoKTsgICAgCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5h Z2VyTWFjLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dlYkZ1 bGxTY3JlZW5NYW5hZ2VyTWFjLmgKaW5kZXggODA1YjEyOTY4M2YxMjliZmM3MDA0MmM2NWMwNjMx NGJiZWVmYjE1ZS4uNGEwMDUwYzlhYTcwNTJhOGE0ZjJjNTBjMmU3MjMwZmM5NmE1ZjdmZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL21hYy9XZWJGdWxs U2NyZWVuTWFuYWdlck1hYy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRnVsbFNj cmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMuaApAQCAtNTQsNyArNTQsNiBAQCBwcml2 YXRlOgogICAgIHZpcnR1YWwgdm9pZCBiZWdpbkV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uKGZsb2F0 IGR1cmF0aW9uKTsKIAogICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX3Jvb3RM YXllcjsKLSAgICBSZXRhaW5QdHI8UGxhdGZvcm1MYXllcj4gbV9mdWxsU2NyZWVuUm9vdExheWVy OwogICAgIExheWVyVHJlZUNvbnRleHQgbV9sYXllclRyZWVDb250ZXh0OwogICAgIFJldGFpblB0 cjxXS0NBUmVtb3RlTGF5ZXJDbGllbnRSZWY+IG1fcmVtb3RlTGF5ZXJDbGllbnQ7CiAgICAgUmV0 YWluUHRyPGlkPiBtX2VudGVyRnVsbFNjcmVlbkxpc3RlbmVyOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlck1h Yy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9tYWMvV2ViRnVsbFNj cmVlbk1hbmFnZXJNYWMubW0KaW5kZXggNGNhMjI1YTc4NzUxOGYzMTcxMzAwYTZlZjJiMDdlZTg3 MzNkYTFmNi4uY2U0NGU1NGY3M2MwNGVkOGEzMjVmYjgzMjY0ZTE0Y2FmZjIxMzMxOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL21hYy9XZWJGdWxsU2Ny ZWVuTWFuYWdlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3Jl ZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tCkBAIC0xMzEsMTggKzEzMSwyMCBAQCBX ZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6fldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjKCkKIAogdm9p ZCBXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihXZWJDb3Jl OjpHcmFwaGljc0xheWVyKiBsYXllcikKIHsKLSAgICBpZiAobV9mdWxsU2NyZWVuUm9vdExheWVy ID09IChsYXllciA/IGxheWVyLT5wbGF0Zm9ybUxheWVyKCkgOiAwKSkKKyAgICBpZiAoKCFtX3Jv b3RMYXllciB8fCBtX3Jvb3RMYXllci0+Y2hpbGRyZW4oKS5pc0VtcHR5KCkpICYmICFsYXllcikK KyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fcm9vdExheWVyICYmIG1fcm9vdExheWVyLT5j aGlsZHJlbigpLmNvbnRhaW5zKGxheWVyKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFs YXllcikgewogICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5h Z2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKKyAgICAgICAgW1tO U05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBwb3N0Tm90aWZpY2F0aW9uTmFtZTpA IldlYktpdExheWVySG9zdENoYW5nZWQiIG9iamVjdDptX3Jvb3RMYXllci0+cGxhdGZvcm1MYXll cigpIHVzZXJJbmZvOm5pbF07CiAgICAgICAgIGlmIChtX3Jvb3RMYXllcikgewogICAgICAgICAg ICAgbV9yb290TGF5ZXItPnJlbW92ZUFsbENoaWxkcmVuKCk7CiAgICAgICAgICAgICBtX3Jvb3RM YXllciA9IG51bGxwdHI7CiAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6QCJXZWJLaXRM YXllckhvc3RDaGFuZ2VkIiBvYmplY3Q6bV9mdWxsU2NyZWVuUm9vdExheWVyLmdldCgpIHVzZXJJ bmZvOm5pbF07Ci0gICAgICAgIG1fZnVsbFNjcmVlblJvb3RMYXllciA9IDA7CisKICAgICAgICAg cmV0dXJuOwogICAgIH0KICAgICAKQEAgLTE2NSwyMCArMTY3LDE2IEBAIHZvaWQgV2ViRnVsbFNj cmVlbk1hbmFnZXJNYWM6OnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NM YXllciogbGF5CiAKICAgICBtX3Jvb3RMYXllci0+cmVtb3ZlQWxsQ2hpbGRyZW4oKTsKICAgICBt X3Jvb3RMYXllci0+YWRkQ2hpbGQobGF5ZXIpOworICAgIG1fcm9vdExheWVyLT5zeW5jQ29tcG9z aXRpbmdTdGF0ZSgpOwogCi0gICAgbV9yb290TGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlRm9y VGhpc0xheWVyT25seSgpOwotICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZp ZXcoKS0+c3luY0NvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMoKTsKLSAgICBtX2Z1 bGxTY3JlZW5Sb290TGF5ZXIgPSBsYXllci0+cGxhdGZvcm1MYXllcigpOwotICAgIGxheWVyLT5z eW5jQ29tcG9zaXRpbmdTdGF0ZSgpOwotCi0gICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZh dWx0Q2VudGVyXSBwb3N0Tm90aWZpY2F0aW9uTmFtZTpAIldlYktpdExheWVySG9zdENoYW5nZWQi IG9iamVjdDptX2Z1bGxTY3JlZW5Sb290TGF5ZXIuZ2V0KCkgdXNlckluZm86bmlsXTsKKyAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHBvc3ROb3RpZmljYXRpb25OYW1l OkAiV2ViS2l0TGF5ZXJIb3N0Q2hhbmdlZCIgb2JqZWN0Om1fcm9vdExheWVyLT5wbGF0Zm9ybUxh eWVyKCkgdXNlckluZm86bmlsXTsKIH0KIAogdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6 YmVnaW5FbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oZmxvYXQgZHVyYXRpb24pCiB7CiAgICAgQVNT RVJUKG1fZWxlbWVudCk7CiAgICAgCi0gICAgaWYgKCFtX2Z1bGxTY3JlZW5Sb290TGF5ZXIpIHsK KyAgICBpZiAoIW1fcm9vdExheWVyIHx8IG1fcm9vdExheWVyLT5jaGlsZHJlbigpLmlzRW1wdHko KSkgewogICAgICAgICAvLyBJZiB3ZSBkb24ndCBoYXZlIGEgcm9vdCBsYXllciwgd2UgY2FuJ3Qg YW5pbWF0ZSBpbiBhbmQgb3V0IG9mIGZ1bGwgc2NyZWVuCiAgICAgICAgIHRoaXMtPmJlZ2FuRW50 ZXJGdWxsU2NyZWVuQW5pbWF0aW9uKCk7CiAgICAgICAgIHRoaXMtPmZpbmlzaGVkRW50ZXJGdWxs U2NyZWVuQW5pbWF0aW9uKHRydWUpOwpAQCAtMTg3LDEzICsxODUsMTIgQEAgdm9pZCBXZWJGdWxs U2NyZWVuTWFuYWdlck1hYzo6YmVnaW5FbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oZmxvYXQgZHVy YXRpb24pCiAKICAgICBJbnRSZWN0IGRlc3RpbmF0aW9uRnJhbWUgPSBnZXRGdWxsU2NyZWVuUmVj dCgpOwogICAgIG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+c2V0RnVsbFNjcmVlblJlbmRlcmVyU2l6 ZShkZXN0aW5hdGlvbkZyYW1lLnNpemUoKSk7Ci0gICAgbV9yb290TGF5ZXItPnN5bmNDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwotICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+bWFp bkZyYW1lKCktPnZpZXcoKS0+c3luY0NvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMo KTsKKyAgICBtX3Jvb3RMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGUoKTsKIAogICAgIC8vIEZJ WE1FOiBPbmNlIHdlIGdhaW4gdGhlIGFiaWxpdHkgdG8gZG8gbmF0aXZlIFdlYktpdCBhbmltYXRp b25zIG9mIGdlbmVyYXRlZAogICAgIC8vIGNvbnRlbnQsIHRoaXMgY2FuIGNoYW5nZSB0byB1c2Ug dGhlbS4gIE1lYW53aGlsZSwgd2UnbGwgaGF2ZSB0byBhbmltYXRlIHRoZQogICAgIC8vIENBTGF5 ZXIgZGlyZWN0bHk6Ci0gICAgQ0FMYXllciogY2FMYXllciA9IG1fZnVsbFNjcmVlblJvb3RMYXll ci5nZXQoKTsKKyAgICBDQUxheWVyKiBjYUxheWVyID0gbV9yb290TGF5ZXItPmNoaWxkcmVuKCku Zmlyc3QoKS0+cGxhdGZvcm1MYXllcigpOwogCiAgICAgLy8gQ3JlYXRlIGEgdHJhbnNmb3JtYXRp b24gbWF0cml4IHRoYXQgd2lsbCB0cmFuc2Zvcm0gdGhlIHJlbmRlcmVyIGxheWVyIHN1Y2ggdGhh dAogICAgIC8vIHRoZSBmdWxsc2NyZWVuIGVsZW1lbnQgYXBwZWFycyB0byBtb3ZlIGZyb20gaXRz IHN0YXJ0aW5nIHBvc2l0aW9uIGFuZCBzaXplIHRvIGl0cwpAQCAtMjMzLDcgKzIzMCw3IEBAIHZv aWQgV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmJlZ2luRXhpdEZ1bGxTY3JlZW5BbmltYXRpb24o ZmxvYXQgZHVyYXRpb24pCiB7CiAgICAgQVNTRVJUKG1fZWxlbWVudCk7CiAgICAgCi0gICAgaWYg KCFtX2Z1bGxTY3JlZW5Sb290TGF5ZXIpIHsKKyAgICBpZiAoIW1fcm9vdExheWVyIHx8IG1fcm9v dExheWVyLT5jaGlsZHJlbigpLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBJZiB3ZSBkb24ndCBo YXZlIGEgcm9vdCBsYXllciwgd2UgY2FuJ3QgYW5pbWF0ZSBpbiBhbmQgb3V0IG9mIGZ1bGwgc2Ny ZWVuCiAgICAgICAgIHRoaXMtPmJlZ2FuRXhpdEZ1bGxTY3JlZW5BbmltYXRpb24oKTsKICAgICAg ICAgdGhpcy0+ZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbih0cnVlKTsKQEAgLTI0Miwx OSArMjM5LDE5IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmJlZ2luRXhpdEZ1bGxT Y3JlZW5BbmltYXRpb24oZmxvYXQgZHVyYXRpb24pCiAKICAgICBJbnRSZWN0IGRlc3RpbmF0aW9u RnJhbWUgPSBnZXRGdWxsU2NyZWVuUmVjdCgpOwogICAgIG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+ c2V0RnVsbFNjcmVlblJlbmRlcmVyU2l6ZShkZXN0aW5hdGlvbkZyYW1lLnNpemUoKSk7Ci0gICAg bV9yb290TGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwotICAg IG1fcGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+c3luY0NvbXBvc2l0aW5n U3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMoKTsKKyAgICBtX3Jvb3RMYXllci0+c3luY0NvbXBvc2l0 aW5nU3RhdGUoKTsKIAogICAgIC8vIEZJWE1FOiBPbmNlIHdlIGdhaW4gdGhlIGFiaWxpdHkgdG8g ZG8gbmF0aXZlIFdlYktpdCBhbmltYXRpb25zIG9mIGdlbmVyYXRlZAogICAgIC8vIGNvbnRlbnQs IHRoaXMgY2FuIGNoYW5nZSB0byB1c2UgdGhlbS4gIE1lYW53aGlsZSwgd2UnbGwgaGF2ZSB0byBh bmltYXRlIHRoZQogICAgIC8vIENBTGF5ZXIgZGlyZWN0bHk6Ci0gICAgQ0FMYXllciogY2FMYXll ciA9IG1fZnVsbFNjcmVlblJvb3RMYXllci5nZXQoKTsKKyAgICBDQUxheWVyKiBjYUxheWVyID0g bV9yb290TGF5ZXItPmNoaWxkcmVuKCkuZmlyc3QoKS0+cGxhdGZvcm1MYXllcigpOworICAgIENB TGF5ZXIqIHByZXNlbnRhdGlvbkxheWVyID0gW2NhTGF5ZXIgcHJlc2VudGF0aW9uTGF5ZXJdID8g KENBTGF5ZXIqKVtjYUxheWVyIHByZXNlbnRhdGlvbkxheWVyXSA6IGNhTGF5ZXI7CiAKICAgICAv LyBDcmVhdGUgYSB0cmFuc2Zvcm1hdGlvbiBtYXRyaXggdGhhdCB3aWxsIHRyYW5zZm9ybSB0aGUg cmVuZGVyZXIgbGF5ZXIgc3VjaCB0aGF0CiAgICAgLy8gdGhlIGZ1bGxzY3JlZW4gZWxlbWVudCBh cHBlYXJzIHRvIG1vdmUgZnJvbSBpdHMgc3RhcnRpbmcgcG9zaXRpb24gYW5kIHNpemUgdG8gaXRz CiAgICAgLy8gZmluYWwgb25lLgotICAgIENHUG9pbnQgZGVzdGluYXRpb25Qb3NpdGlvbiA9IFso Q0FMYXllciAqKVtjYUxheWVyIHByZXNlbnRhdGlvbkxheWVyXSBwb3NpdGlvbl07Ci0gICAgQ0dS ZWN0IGRlc3RpbmF0aW9uQm91bmRzID0gWyhDQUxheWVyICopW2NhTGF5ZXIgcHJlc2VudGF0aW9u TGF5ZXJdIGJvdW5kc107CisgICAgQ0dQb2ludCBkZXN0aW5hdGlvblBvc2l0aW9uID0gW3ByZXNl bnRhdGlvbkxheWVyIHBvc2l0aW9uXTsKKyAgICBDR1JlY3QgZGVzdGluYXRpb25Cb3VuZHMgPSBb cHJlc2VudGF0aW9uTGF5ZXIgYm91bmRzXTsKICAgICBDR1BvaW50IGxheWVyQW5jaG9yID0gW2Nh TGF5ZXIgYW5jaG9yUG9pbnRdOwogICAgIENHUG9pbnQgaW5pdGlhbFBvc2l0aW9uID0gQ0dQb2lu dE1ha2UoCiAgICAgICAgIG1faW5pdGlhbEZyYW1lLngoKSArIG1faW5pdGlhbEZyYW1lLndpZHRo KCkgKiBsYXllckFuY2hvci54LApAQCAtMjY4LDcgKzI2NSw3IEBAIHZvaWQgV2ViRnVsbFNjcmVl bk1hbmFnZXJNYWM6OmJlZ2luRXhpdEZ1bGxTY3JlZW5BbmltYXRpb24oZmxvYXQgZHVyYXRpb24p CiAgICAgICAgIGRlc3RpbmF0aW9uUG9zaXRpb24ueSAtIGluaXRpYWxQb3NpdGlvbi55LCAwKTsK ICAgICBDQVRyYW5zZm9ybTNEIGZpbmFsVHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRENvbmNhdChz aHJpbmtUcmFuc2Zvcm0sIHNoaWZ0VHJhbnNmb3JtKTsKIAotICAgIENBVHJhbnNmb3JtM0QgaW5p dGlhbFRyYW5zZm9ybSA9IFsoQ0FMYXllciopW2NhTGF5ZXIgcHJlc2VudGF0aW9uTGF5ZXJdIHRy YW5zZm9ybV07CisgICAgQ0FUcmFuc2Zvcm0zRCBpbml0aWFsVHJhbnNmb3JtID0gW3ByZXNlbnRh dGlvbkxheWVyIHRyYW5zZm9ybV07CiAKICAgICAvLyBVc2UgYSBDQUJhc2ljQW5pbWF0aW9uIGhl cmUgZm9yIHRoZSB6b29tIGVmZmVjdC4gV2Ugd2FudCB0byBiZSBub3RpZmllZCB0aGF0IHRoZSBh bmltYXRpb24gaGFzCiAgICAgLy8gY29tcGxldGVkIGJ5IHdheSBvZiB0aGUgQ0FBbmltYXRpb24g ZGVsZWdhdGUuCg==