126042 2013-12-19 19:17:00 -0800 Clarify the behavior of composited canvases 2013-12-19 21:29:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino eflews.bot esprehn+autocc glenn gyuyoung.kim kondapallykalyan simon.fraser thorton oldest_to_newest 961688 0 simon.fraser 2013-12-19 19:17:00 -0800 Clarify the behavior of composited canvases 961690 1 219718 simon.fraser 2013-12-19 19:20:12 -0800 Created attachment 219718 Patch 961693 2 219718 eflews.bot 2013-12-19 19:26:20 -0800 Comment on attachment 219718 Patch Attachment 219718 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/50208140 961694 3 219718 thorton 2013-12-19 19:30:11 -0800 Comment on attachment 219718 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219718&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:88 > #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) This #if needs to have a case for IOSurface-backed canvas too, otherwise if PLATFORM(MAC) were to compile WebGL out we'd always be returning UnacceleratedCanvas. Or like you mentioned on IRC you might not need them at all. 961695 4 219719 simon.fraser 2013-12-19 19:34:51 -0800 Created attachment 219719 Patch 961696 5 219720 simon.fraser 2013-12-19 19:37:06 -0800 Created attachment 219720 Patch 961698 6 simon.fraser 2013-12-19 19:38:06 -0800 *** Bug 126039 has been marked as a duplicate of this bug. *** 961699 7 simon.fraser 2013-12-19 19:45:25 -0800 https://trac.webkit.org/r160894 961731 8 thorton 2013-12-19 21:29:34 -0800 Should HTMLCanvasElement::paintsIntoCanvasBuffer() reference this for clarity's sake? 219718 2013-12-19 19:20:12 -0800 2013-12-19 19:34:49 -0800 Patch bug-126042-20131219192011.patch text/plain 6599 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI5ODkzMDAzZTg2YmQ0 ODA5YzdmMTYzOWY1NTg4OTRhMmFjNWZhYS4uMjE3ODdhMjA1YjEzNmRlYmMwZTBhNWQzODE5MTQx OWMxNGY2NjZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsYXJpZnkgdGhl IGJlaGF2aW9yIG9mIGNvbXBvc2l0ZWQgY2FudmFzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjA0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERpZmZlcmVudCBwbGF0Zm9ybXMgY29tcG9zaXRlIDJE IGFuZCAzRCBjYW52YXNlcyBpbiBkaWZmZXJlbnQgd2F5cy4KKyAgICAgICAgCisgICAgICAgICJB Y2NlbGVyYXRlZCAyRCIgY2FudmFzZXMsIGFuZCBXZWJHTCBhcmUgYWx3YXlzIHNldCBhcyBHcmFw aGljc0xheWVyCisgICAgICAgIGNvbnRlbnRzLgorICAgICAgICAKKyAgICAgICAgIklPU3VyZmFj ZSIgY2FudmFzZXMgKE1hYyBhbmQgaU9TLW9ubHkpIGdldCBhIGNvbXBvc2l0aW5nIGxheWVyLCBi dXQKKyAgICAgICAgcGFpbnQgaW50byBpdCAoYmVjYXVzZSB0aGlzIGlzIGZhc3QsIGFuZCBhIGNv bnZlbmllbnQgd2F5IHRvIGdldAorICAgICAgICBzeW5jaHJvbml6YXRpb24pLgorICAgICAgICAK KyAgICAgICAgU28gbWFrZSB0aGVzZSBiZWhhdmlvcnMgZXhwbGljaXQgaW4gUmVuZGVyTGF5ZXJC YWNraW5nIGFuZCBSZW5kZXJMYXllckNvbXBvc2l0b3IuCisgICAgICAgIE5vIGJlaGF2aW9yIGNo YW5nZXMgb24gT1MgWCwgYnVnIGZpeCBvbiBpT1MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbnZhc0NvbXBvc2l0aW5n U3RyYXRlZ3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVH cmFwaGljc0xheWVyQ29uZmlndXJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjpjb250ZW50Q2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1 aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKToKKwogMjAxMy0xMi0xOSAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBvdmVyZmxvd2NoYW5nZWQgZXZlbnQgY291bGQg Y2F1c2UgYSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAppbmRleCAxMjk1YTA2NGZjZjExOWRjZDc4M2IzZTBmNTBlMWE1YzllZDk3N2Q0 Li4wZGZlNjFkZGNiOGYzOGM5NTczMGU5NDZkYzQ2MGE0YmY3Mzc2OTM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtODEsMTggKzgx LDI3IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiBzdGF0aWMgYm9vbCBoYXNCb3hEZWNv cmF0aW9uc09yQmFja2dyb3VuZEltYWdlKGNvbnN0IFJlbmRlclN0eWxlKik7CiBzdGF0aWMgSW50 UmVjdCBjbGlwQm94KFJlbmRlckJveCYgcmVuZGVyZXIpOwogCi1zdGF0aWMgaW5saW5lIGJvb2wg aXNBY2NlbGVyYXRlZENhbnZhcyhSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQorQ2FudmFzQ29tcG9z aXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KGNvbnN0IFJlbmRlck9iamVj dCYgcmVuZGVyZXIpCiB7CisgICAgQVNTRVJUX1VOVVNFRChyZW5kZXJlciwgcmVuZGVyZXIuaXND YW52YXMoKSk7CisgICAgCiAjaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURf MkRfQ0FOVkFTKQotICAgIGlmIChyZW5kZXJlci0+aXNDYW52YXMoKSkgewotICAgICAgICBjb25z dCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2FudmFzRWxlbWVudChyZW5kZXJl ci0+bm9kZSgpKTsKLSAgICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQg PSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBjb250ZXh0 LT5pc0FjY2VsZXJhdGVkKCk7Ci0gICAgfQorICAgIGNvbnN0IEhUTUxDYW52YXNFbGVtZW50KiBj YW52YXMgPSB0b0hUTUxDYW52YXNFbGVtZW50KHJlbmRlcmVyLm5vZGUoKSk7CisgICAgaWYgKENh bnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQo KSkgeworICAgICAgICBpZiAoIWNvbnRleHQtPmlzQWNjZWxlcmF0ZWQoKSkKKyAgICAgICAgICAg IHJldHVybiBVbmFjY2VsZXJhdGVkQ2FudmFzOworCisgICAgICAgIGlmIChjb250ZXh0LT5pczNk KCkpCisgICAgICAgICAgICByZXR1cm4gQ2FudmFzQXNMYXllckNvbnRlbnRzOworCisjaWYgRU5B QkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKKyAgICAgICAgcmV0dXJuIENhbnZhc0FzTGF5ZXJD b250ZW50czsKICNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHJlbmRlcmVyKTsKKyAgICAgICAgcmV0 dXJuIENhbnZhc1BhaW50ZWRUb0xheWVyOyAvLyBPbiBNYWMgYW5kIGlPUyB3ZSBwYWludCBhY2Nl bGVyYXRlZCBjYW52YXNlcyBpbnRvIHRoZWlyIGxheWVycy4KICNlbmRpZgotICAgIHJldHVybiBm YWxzZTsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4gVW5hY2NlbGVyYXRlZENhbnZhczsKIH0K IAogLy8gR2V0IHRoZSBzY3JvbGxpbmcgY29vcmRpbmF0b3IgaW4gYSB3YXkgdGhhdCB3b3JrcyBp bnNpZGUgUmVuZGVyTGF5ZXJCYWNraW5nJ3MgZGVzdHJ1Y3Rvci4KQEAgLTYyNiw3ICs2MzUsNyBA QCBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRp b24oKQogICAgIH0KICNlbmRpZgogI2lmIEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJB VEVEXzJEX0NBTlZBUykKLSAgICBlbHNlIGlmIChpc0FjY2VsZXJhdGVkQ2FudmFzKCZyZW5kZXJl cigpKSkgeworICAgIGVsc2UgaWYgKHJlbmRlcmVyKCkuaXNDYW52YXMoKSAmJiBjYW52YXNDb21w b3NpdGluZ1N0cmF0ZWd5KHJlbmRlcmVyKCkpID09IENhbnZhc0FzTGF5ZXJDb250ZW50cykgewog ICAgICAgICBjb25zdCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2FudmFzRWxl bWVudChyZW5kZXJlcigpLmVsZW1lbnQoKSk7CiAgICAgICAgIGlmIChDYW52YXNSZW5kZXJpbmdD b250ZXh0KiBjb250ZXh0ID0gY2FudmFzLT5yZW5kZXJpbmdDb250ZXh0KCkpCiAgICAgICAgICAg ICBtX2dyYXBoaWNzTGF5ZXItPnNldENvbnRlbnRzVG9DYW52YXMoY29udGV4dC0+cGxhdGZvcm1M YXllcigpKTsKQEAgLTE4MzIsOSArMTg0MSw5IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpj b250YWluc1BhaW50ZWRDb250ZW50KGJvb2wgaXNTaW1wbGVDb250YWluZXIpIGNvbnN0CiAgICAg aWYgKHJlbmRlcmVyKCkuaXNWaWRlbygpICYmIHRvUmVuZGVyVmlkZW8ocmVuZGVyZXIoKSkuc2hv dWxkRGlzcGxheVZpZGVvKCkpCiAgICAgICAgIHJldHVybiBtX293bmluZ0xheWVyLmhhc0JveERl Y29yYXRpb25zT3JCYWNrZ3JvdW5kKCk7CiAjZW5kaWYKLSNpZiBQTEFURk9STShNQUMpICYmICFQ TEFURk9STShJT1MpICYmIFVTRShDQSkKLSNlbGlmIEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFD Q0VMRVJBVEVEXzJEX0NBTlZBUykgfHwgUExBVEZPUk0oSU9TX1NJTVVMQVRPUikKLSAgICBpZiAo aXNBY2NlbGVyYXRlZENhbnZhcygmcmVuZGVyZXIoKSkpCisKKyNpZiBFTkFCTEUoV0VCR0wpIHx8 IEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCisgICAgaWYgKHJlbmRlcmVyKCkuaXNDYW52 YXMoKSAmJiBjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KHJlbmRlcmVyKCkpID09IENhbnZhc0Fz TGF5ZXJDb250ZW50cykKICAgICAgICAgcmV0dXJuIG1fb3duaW5nTGF5ZXIuaGFzQm94RGVjb3Jh dGlvbnNPckJhY2tncm91bmQoKTsKICNlbmRpZgogCkBAIC0xODgzLDcgKzE4OTIsNyBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6Y29udGVudENoYW5nZWQoQ29udGVudENoYW5nZVR5cGUgY2hh bmdlVHlwZSkKICAgICB9CiAKICNpZiBFTkFCTEUoV0VCR0wpIHx8IEVOQUJMRShBQ0NFTEVSQVRF RF8yRF9DQU5WQVMpCi0gICAgaWYgKChjaGFuZ2VUeXBlID09IENhbnZhc0NoYW5nZWQgfHwgY2hh bmdlVHlwZSA9PSBDYW52YXNQaXhlbHNDaGFuZ2VkKSAmJiBpc0FjY2VsZXJhdGVkQ2FudmFzKCZy ZW5kZXJlcigpKSkgeworICAgIGlmICgoY2hhbmdlVHlwZSA9PSBDYW52YXNDaGFuZ2VkIHx8IGNo YW5nZVR5cGUgPT0gQ2FudmFzUGl4ZWxzQ2hhbmdlZCkgJiYgcmVuZGVyZXIoKS5pc0NhbnZhcygp ICYmIGNhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kocmVuZGVyZXIoKSkgPT0gQ2FudmFzQXNMYXll ckNvbnRlbnRzKSB7CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNOZWVkc0Rp c3BsYXkoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCA2MTc5Njg3YjYxZGIwMWZhOGNmYjM0NzVm ZGQzZWRlNTRlYjE1ZDUxLi4zYjNmMGIxMDc4ZDBhNjBjYTc2OTBlN2ViNTZhZTE5ZTlhMmViMTE5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBA IC0zMjgsNiArMzI4LDEzIEBAIHByaXZhdGU6CiAgICAgc3RhdGljIGJvb2wgbV9jcmVhdGluZ1By aW1hcnlHcmFwaGljc0xheWVyOwogfTsKIAorZW51bSBDYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5 IHsKKyAgICBVbmFjY2VsZXJhdGVkQ2FudmFzLAorICAgIENhbnZhc1BhaW50ZWRUb0xheWVyLAor ICAgIENhbnZhc0FzTGF5ZXJDb250ZW50cworfTsKK0NhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kg Y2FudmFzQ29tcG9zaXRpbmdTdHJhdGVneShjb25zdCBSZW5kZXJPYmplY3QmKTsKKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAppbmRleCA2MWU0OWRhNmJkYTNiOWViODYwMGJmNGJmZWZkMzI2YjFjODczN2IxLi4zNzRj Mzk4NWQ5MzhjNDRmN2YwNjM5N2Q2OGEyOGFiYmQxYWYxYmM0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMjI2OSw3ICsy MjY5LDggQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29tcG9zaXRpbmdG b3JDYW52YXMoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYKICNlbHNlCiAgICAgICAgIGJvb2wgaXND YW52YXNMYXJnZUVub3VnaFRvRm9yY2VDb21wb3NpdGluZyA9IGNhbnZhcy0+c2l6ZSgpLmFyZWEo KSA+PSBjYW52YXNBcmVhVGhyZXNob2xkUmVxdWlyaW5nQ29tcG9zaXRpbmc7CiAjZW5kaWYKLSAg ICAgICAgcmV0dXJuIGNhbnZhcy0+cmVuZGVyaW5nQ29udGV4dCgpICYmIGNhbnZhcy0+cmVuZGVy aW5nQ29udGV4dCgpLT5pc0FjY2VsZXJhdGVkKCkgJiYgKGNhbnZhcy0+cmVuZGVyaW5nQ29udGV4 dCgpLT5pczNkKCkgfHwgaXNDYW52YXNMYXJnZUVub3VnaFRvRm9yY2VDb21wb3NpdGluZyk7Cisg ICAgICAgIENhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kgY29tcG9zaXRpbmdTdHJhdGVneSA9IGNh bnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kocmVuZGVyZXIpOworICAgICAgICByZXR1cm4gY29tcG9z aXRpbmdTdHJhdGVneSA9PSBDYW52YXNBc0xheWVyQ29udGVudHMgfHwgKGNvbXBvc2l0aW5nU3Ry YXRlZ3kgPT0gQ2FudmFzUGFpbnRlZFRvTGF5ZXIgJiYgaXNDYW52YXNMYXJnZUVub3VnaFRvRm9y Y2VDb21wb3NpdGluZyk7CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwo= 219719 2013-12-19 19:34:51 -0800 2013-12-19 19:37:03 -0800 Patch bug-126042-20131219193450.patch text/plain 6520 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI5ODkzMDAzZTg2YmQ0 ODA5YzdmMTYzOWY1NTg4OTRhMmFjNWZhYS4uMjE3ODdhMjA1YjEzNmRlYmMwZTBhNWQzODE5MTQx OWMxNGY2NjZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsYXJpZnkgdGhl IGJlaGF2aW9yIG9mIGNvbXBvc2l0ZWQgY2FudmFzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjA0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERpZmZlcmVudCBwbGF0Zm9ybXMgY29tcG9zaXRlIDJE IGFuZCAzRCBjYW52YXNlcyBpbiBkaWZmZXJlbnQgd2F5cy4KKyAgICAgICAgCisgICAgICAgICJB Y2NlbGVyYXRlZCAyRCIgY2FudmFzZXMsIGFuZCBXZWJHTCBhcmUgYWx3YXlzIHNldCBhcyBHcmFw aGljc0xheWVyCisgICAgICAgIGNvbnRlbnRzLgorICAgICAgICAKKyAgICAgICAgIklPU3VyZmFj ZSIgY2FudmFzZXMgKE1hYyBhbmQgaU9TLW9ubHkpIGdldCBhIGNvbXBvc2l0aW5nIGxheWVyLCBi dXQKKyAgICAgICAgcGFpbnQgaW50byBpdCAoYmVjYXVzZSB0aGlzIGlzIGZhc3QsIGFuZCBhIGNv bnZlbmllbnQgd2F5IHRvIGdldAorICAgICAgICBzeW5jaHJvbml6YXRpb24pLgorICAgICAgICAK KyAgICAgICAgU28gbWFrZSB0aGVzZSBiZWhhdmlvcnMgZXhwbGljaXQgaW4gUmVuZGVyTGF5ZXJC YWNraW5nIGFuZCBSZW5kZXJMYXllckNvbXBvc2l0b3IuCisgICAgICAgIE5vIGJlaGF2aW9yIGNo YW5nZXMgb24gT1MgWCwgYnVnIGZpeCBvbiBpT1MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbnZhc0NvbXBvc2l0aW5n U3RyYXRlZ3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVH cmFwaGljc0xheWVyQ29uZmlndXJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjpjb250ZW50Q2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1 aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKToKKwogMjAxMy0xMi0xOSAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBvdmVyZmxvd2NoYW5nZWQgZXZlbnQgY291bGQg Y2F1c2UgYSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAppbmRleCAxMjk1YTA2NGZjZjExOWRjZDc4M2IzZTBmNTBlMWE1YzllZDk3N2Q0 Li5lYmMwMWQxZGIyMDIzNTY4YjIzODU3Mzc4YjJiZGY0NmNmMThlZGE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtODEsMTggKzgx LDIzIEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiBzdGF0aWMgYm9vbCBoYXNCb3hEZWNv cmF0aW9uc09yQmFja2dyb3VuZEltYWdlKGNvbnN0IFJlbmRlclN0eWxlKik7CiBzdGF0aWMgSW50 UmVjdCBjbGlwQm94KFJlbmRlckJveCYgcmVuZGVyZXIpOwogCi1zdGF0aWMgaW5saW5lIGJvb2wg aXNBY2NlbGVyYXRlZENhbnZhcyhSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQorQ2FudmFzQ29tcG9z aXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KGNvbnN0IFJlbmRlck9iamVj dCYgcmVuZGVyZXIpCiB7Ci0jaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURf MkRfQ0FOVkFTKQotICAgIGlmIChyZW5kZXJlci0+aXNDYW52YXMoKSkgewotICAgICAgICBjb25z dCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2FudmFzRWxlbWVudChyZW5kZXJl ci0+bm9kZSgpKTsKLSAgICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQg PSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBjb250ZXh0 LT5pc0FjY2VsZXJhdGVkKCk7Ci0gICAgfQorICAgIEFTU0VSVChyZW5kZXJlci5pc0NhbnZhcygp KTsKKyAgICAKKyAgICBjb25zdCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2Fu dmFzRWxlbWVudChyZW5kZXJlci5ub2RlKCkpOworICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQq IGNvbnRleHQgPSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKTsKKyAgICBpZiAoIWNvbnRleHQg fHwgIWNvbnRleHQtPmlzQWNjZWxlcmF0ZWQoKSkKKyAgICAgICAgcmV0dXJuIFVuYWNjZWxlcmF0 ZWRDYW52YXM7CisgICAgCisgICAgaWYgKGNvbnRleHQtPmlzM2QoKSkKKyAgICAgICAgcmV0dXJu IENhbnZhc0FzTGF5ZXJDb250ZW50czsKKworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5W QVMpCisgICAgcmV0dXJuIENhbnZhc0FzTGF5ZXJDb250ZW50czsKICNlbHNlCi0gICAgVU5VU0VE X1BBUkFNKHJlbmRlcmVyKTsKKyAgICByZXR1cm4gQ2FudmFzUGFpbnRlZFRvTGF5ZXI7IC8vIE9u IE1hYyBhbmQgaU9TIHdlIHBhaW50IGFjY2VsZXJhdGVkIGNhbnZhc2VzIGludG8gdGhlaXIgbGF5 ZXJzLgogI2VuZGlmCi0gICAgcmV0dXJuIGZhbHNlOwogfQogCiAvLyBHZXQgdGhlIHNjcm9sbGlu ZyBjb29yZGluYXRvciBpbiBhIHdheSB0aGF0IHdvcmtzIGluc2lkZSBSZW5kZXJMYXllckJhY2tp bmcncyBkZXN0cnVjdG9yLgpAQCAtNjI2LDcgKzYzMSw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVHcmFwaGljc0xheWVyQ29uZmlndXJhdGlvbigpCiAgICAgfQogI2VuZGlmCiAj aWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQotICAgIGVs c2UgaWYgKGlzQWNjZWxlcmF0ZWRDYW52YXMoJnJlbmRlcmVyKCkpKSB7CisgICAgZWxzZSBpZiAo cmVuZGVyZXIoKS5pc0NhbnZhcygpICYmIGNhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kocmVuZGVy ZXIoKSkgPT0gQ2FudmFzQXNMYXllckNvbnRlbnRzKSB7CiAgICAgICAgIGNvbnN0IEhUTUxDYW52 YXNFbGVtZW50KiBjYW52YXMgPSB0b0hUTUxDYW52YXNFbGVtZW50KHJlbmRlcmVyKCkuZWxlbWVu dCgpKTsKICAgICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBjYW52 YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKICAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 Q29udGVudHNUb0NhbnZhcyhjb250ZXh0LT5wbGF0Zm9ybUxheWVyKCkpOwpAQCAtMTgzMiw5ICsx ODM3LDkgQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQo Ym9vbCBpc1NpbXBsZUNvbnRhaW5lcikgY29uc3QKICAgICBpZiAocmVuZGVyZXIoKS5pc1ZpZGVv KCkgJiYgdG9SZW5kZXJWaWRlbyhyZW5kZXJlcigpKS5zaG91bGREaXNwbGF5VmlkZW8oKSkKICAg ICAgICAgcmV0dXJuIG1fb3duaW5nTGF5ZXIuaGFzQm94RGVjb3JhdGlvbnNPckJhY2tncm91bmQo KTsKICNlbmRpZgotI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykgJiYgVVNFKENB KQotI2VsaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKSB8 fCBQTEFURk9STShJT1NfU0lNVUxBVE9SKQotICAgIGlmIChpc0FjY2VsZXJhdGVkQ2FudmFzKCZy ZW5kZXJlcigpKSkKKworI2lmIEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJE X0NBTlZBUykKKyAgICBpZiAocmVuZGVyZXIoKS5pc0NhbnZhcygpICYmIGNhbnZhc0NvbXBvc2l0 aW5nU3RyYXRlZ3kocmVuZGVyZXIoKSkgPT0gQ2FudmFzQXNMYXllckNvbnRlbnRzKQogICAgICAg ICByZXR1cm4gbV9vd25pbmdMYXllci5oYXNCb3hEZWNvcmF0aW9uc09yQmFja2dyb3VuZCgpOwog I2VuZGlmCiAKQEAgLTE4ODMsNyArMTg4OCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpj b250ZW50Q2hhbmdlZChDb250ZW50Q2hhbmdlVHlwZSBjaGFuZ2VUeXBlKQogICAgIH0KIAogI2lm IEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKLSAgICBpZiAo KGNoYW5nZVR5cGUgPT0gQ2FudmFzQ2hhbmdlZCB8fCBjaGFuZ2VUeXBlID09IENhbnZhc1BpeGVs c0NoYW5nZWQpICYmIGlzQWNjZWxlcmF0ZWRDYW52YXMoJnJlbmRlcmVyKCkpKSB7CisgICAgaWYg KChjaGFuZ2VUeXBlID09IENhbnZhc0NoYW5nZWQgfHwgY2hhbmdlVHlwZSA9PSBDYW52YXNQaXhl bHNDaGFuZ2VkKSAmJiByZW5kZXJlcigpLmlzQ2FudmFzKCkgJiYgY2FudmFzQ29tcG9zaXRpbmdT dHJhdGVneShyZW5kZXJlcigpKSA9PSBDYW52YXNBc0xheWVyQ29udGVudHMpIHsKICAgICAgICAg bV9ncmFwaGljc0xheWVyLT5zZXRDb250ZW50c05lZWRzRGlzcGxheSgpOwogICAgICAgICByZXR1 cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCmluZGV4IDYxNzk2ODdiNjFkYjAxZmE4Y2ZiMzQ3NWZkZDNlZGU1NGViMTVkNTEuLjNiM2Yw YjEwNzhkMGE2MGNhNzY5MGU3ZWI1NmFlMTllOWEyZWIxMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTMyOCw2ICszMjgsMTMgQEAgcHJp dmF0ZToKICAgICBzdGF0aWMgYm9vbCBtX2NyZWF0aW5nUHJpbWFyeUdyYXBoaWNzTGF5ZXI7CiB9 OwogCitlbnVtIENhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kgeworICAgIFVuYWNjZWxlcmF0ZWRD YW52YXMsCisgICAgQ2FudmFzUGFpbnRlZFRvTGF5ZXIsCisgICAgQ2FudmFzQXNMYXllckNvbnRl bnRzCit9OworQ2FudmFzQ29tcG9zaXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0 ZWd5KGNvbnN0IFJlbmRlck9iamVjdCYpOworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDYxZTQ5ZGE2YmRh M2I5ZWI4NjAwYmY0YmZlZmQzMjZiMWM4NzM3YjEuLjM3NGMzOTg1ZDkzOGM0NGY3ZjA2Mzk3ZDY4 YTI4YWJiZDFhZjFiYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yMjY5LDcgKzIyNjksOCBAQCBib29sIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvckNhbnZhcyhSZW5kZXJMYXllck1v ZGVsT2JqZWN0JgogI2Vsc2UKICAgICAgICAgYm9vbCBpc0NhbnZhc0xhcmdlRW5vdWdoVG9Gb3Jj ZUNvbXBvc2l0aW5nID0gY2FudmFzLT5zaXplKCkuYXJlYSgpID49IGNhbnZhc0FyZWFUaHJlc2hv bGRSZXF1aXJpbmdDb21wb3NpdGluZzsKICNlbmRpZgotICAgICAgICByZXR1cm4gY2FudmFzLT5y ZW5kZXJpbmdDb250ZXh0KCkgJiYgY2FudmFzLT5yZW5kZXJpbmdDb250ZXh0KCktPmlzQWNjZWxl cmF0ZWQoKSAmJiAoY2FudmFzLT5yZW5kZXJpbmdDb250ZXh0KCktPmlzM2QoKSB8fCBpc0NhbnZh c0xhcmdlRW5vdWdoVG9Gb3JjZUNvbXBvc2l0aW5nKTsKKyAgICAgICAgQ2FudmFzQ29tcG9zaXRp bmdTdHJhdGVneSBjb21wb3NpdGluZ1N0cmF0ZWd5ID0gY2FudmFzQ29tcG9zaXRpbmdTdHJhdGVn eShyZW5kZXJlcik7CisgICAgICAgIHJldHVybiBjb21wb3NpdGluZ1N0cmF0ZWd5ID09IENhbnZh c0FzTGF5ZXJDb250ZW50cyB8fCAoY29tcG9zaXRpbmdTdHJhdGVneSA9PSBDYW52YXNQYWludGVk VG9MYXllciAmJiBpc0NhbnZhc0xhcmdlRW5vdWdoVG9Gb3JjZUNvbXBvc2l0aW5nKTsKICAgICB9 CiAKICAgICByZXR1cm4gZmFsc2U7Cg== 219720 2013-12-19 19:37:06 -0800 2013-12-19 19:38:39 -0800 Patch bug-126042-20131219193704.patch text/plain 6836 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI5ODkzMDAzZTg2YmQ0 ODA5YzdmMTYzOWY1NTg4OTRhMmFjNWZhYS4uMjE3ODdhMjA1YjEzNmRlYmMwZTBhNWQzODE5MTQx OWMxNGY2NjZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsYXJpZnkgdGhl IGJlaGF2aW9yIG9mIGNvbXBvc2l0ZWQgY2FudmFzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjA0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERpZmZlcmVudCBwbGF0Zm9ybXMgY29tcG9zaXRlIDJE IGFuZCAzRCBjYW52YXNlcyBpbiBkaWZmZXJlbnQgd2F5cy4KKyAgICAgICAgCisgICAgICAgICJB Y2NlbGVyYXRlZCAyRCIgY2FudmFzZXMsIGFuZCBXZWJHTCBhcmUgYWx3YXlzIHNldCBhcyBHcmFw aGljc0xheWVyCisgICAgICAgIGNvbnRlbnRzLgorICAgICAgICAKKyAgICAgICAgIklPU3VyZmFj ZSIgY2FudmFzZXMgKE1hYyBhbmQgaU9TLW9ubHkpIGdldCBhIGNvbXBvc2l0aW5nIGxheWVyLCBi dXQKKyAgICAgICAgcGFpbnQgaW50byBpdCAoYmVjYXVzZSB0aGlzIGlzIGZhc3QsIGFuZCBhIGNv bnZlbmllbnQgd2F5IHRvIGdldAorICAgICAgICBzeW5jaHJvbml6YXRpb24pLgorICAgICAgICAK KyAgICAgICAgU28gbWFrZSB0aGVzZSBiZWhhdmlvcnMgZXhwbGljaXQgaW4gUmVuZGVyTGF5ZXJC YWNraW5nIGFuZCBSZW5kZXJMYXllckNvbXBvc2l0b3IuCisgICAgICAgIE5vIGJlaGF2aW9yIGNo YW5nZXMgb24gT1MgWCwgYnVnIGZpeCBvbiBpT1MuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbnZhc0NvbXBvc2l0aW5n U3RyYXRlZ3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVH cmFwaGljc0xheWVyQ29uZmlndXJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjpjb250ZW50Q2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1 aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKToKKwogMjAxMy0xMi0xOSAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBvdmVyZmxvd2NoYW5nZWQgZXZlbnQgY291bGQg Y2F1c2UgYSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAppbmRleCAxMjk1YTA2NGZjZjExOWRjZDc4M2IzZTBmNTBlMWE1YzllZDk3N2Q0 Li5lYmMwMWQxZGIyMDIzNTY4YjIzODU3Mzc4YjJiZGY0NmNmMThlZGE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtODEsMTggKzgx LDIzIEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiBzdGF0aWMgYm9vbCBoYXNCb3hEZWNv cmF0aW9uc09yQmFja2dyb3VuZEltYWdlKGNvbnN0IFJlbmRlclN0eWxlKik7CiBzdGF0aWMgSW50 UmVjdCBjbGlwQm94KFJlbmRlckJveCYgcmVuZGVyZXIpOwogCi1zdGF0aWMgaW5saW5lIGJvb2wg aXNBY2NlbGVyYXRlZENhbnZhcyhSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQorQ2FudmFzQ29tcG9z aXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KGNvbnN0IFJlbmRlck9iamVj dCYgcmVuZGVyZXIpCiB7Ci0jaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURf MkRfQ0FOVkFTKQotICAgIGlmIChyZW5kZXJlci0+aXNDYW52YXMoKSkgewotICAgICAgICBjb25z dCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2FudmFzRWxlbWVudChyZW5kZXJl ci0+bm9kZSgpKTsKLSAgICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQg PSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBjb250ZXh0 LT5pc0FjY2VsZXJhdGVkKCk7Ci0gICAgfQorICAgIEFTU0VSVChyZW5kZXJlci5pc0NhbnZhcygp KTsKKyAgICAKKyAgICBjb25zdCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gdG9IVE1MQ2Fu dmFzRWxlbWVudChyZW5kZXJlci5ub2RlKCkpOworICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQq IGNvbnRleHQgPSBjYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKTsKKyAgICBpZiAoIWNvbnRleHQg fHwgIWNvbnRleHQtPmlzQWNjZWxlcmF0ZWQoKSkKKyAgICAgICAgcmV0dXJuIFVuYWNjZWxlcmF0 ZWRDYW52YXM7CisgICAgCisgICAgaWYgKGNvbnRleHQtPmlzM2QoKSkKKyAgICAgICAgcmV0dXJu IENhbnZhc0FzTGF5ZXJDb250ZW50czsKKworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5W QVMpCisgICAgcmV0dXJuIENhbnZhc0FzTGF5ZXJDb250ZW50czsKICNlbHNlCi0gICAgVU5VU0VE X1BBUkFNKHJlbmRlcmVyKTsKKyAgICByZXR1cm4gQ2FudmFzUGFpbnRlZFRvTGF5ZXI7IC8vIE9u IE1hYyBhbmQgaU9TIHdlIHBhaW50IGFjY2VsZXJhdGVkIGNhbnZhc2VzIGludG8gdGhlaXIgbGF5 ZXJzLgogI2VuZGlmCi0gICAgcmV0dXJuIGZhbHNlOwogfQogCiAvLyBHZXQgdGhlIHNjcm9sbGlu ZyBjb29yZGluYXRvciBpbiBhIHdheSB0aGF0IHdvcmtzIGluc2lkZSBSZW5kZXJMYXllckJhY2tp bmcncyBkZXN0cnVjdG9yLgpAQCAtNjI2LDcgKzYzMSw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVHcmFwaGljc0xheWVyQ29uZmlndXJhdGlvbigpCiAgICAgfQogI2VuZGlmCiAj aWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQotICAgIGVs c2UgaWYgKGlzQWNjZWxlcmF0ZWRDYW52YXMoJnJlbmRlcmVyKCkpKSB7CisgICAgZWxzZSBpZiAo cmVuZGVyZXIoKS5pc0NhbnZhcygpICYmIGNhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kocmVuZGVy ZXIoKSkgPT0gQ2FudmFzQXNMYXllckNvbnRlbnRzKSB7CiAgICAgICAgIGNvbnN0IEhUTUxDYW52 YXNFbGVtZW50KiBjYW52YXMgPSB0b0hUTUxDYW52YXNFbGVtZW50KHJlbmRlcmVyKCkuZWxlbWVu dCgpKTsKICAgICAgICAgaWYgKENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIGNvbnRleHQgPSBjYW52 YXMtPnJlbmRlcmluZ0NvbnRleHQoKSkKICAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 Q29udGVudHNUb0NhbnZhcyhjb250ZXh0LT5wbGF0Zm9ybUxheWVyKCkpOwpAQCAtMTgzMiw5ICsx ODM3LDkgQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQo Ym9vbCBpc1NpbXBsZUNvbnRhaW5lcikgY29uc3QKICAgICBpZiAocmVuZGVyZXIoKS5pc1ZpZGVv KCkgJiYgdG9SZW5kZXJWaWRlbyhyZW5kZXJlcigpKS5zaG91bGREaXNwbGF5VmlkZW8oKSkKICAg ICAgICAgcmV0dXJuIG1fb3duaW5nTGF5ZXIuaGFzQm94RGVjb3JhdGlvbnNPckJhY2tncm91bmQo KTsKICNlbmRpZgotI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykgJiYgVVNFKENB KQotI2VsaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKSB8 fCBQTEFURk9STShJT1NfU0lNVUxBVE9SKQotICAgIGlmIChpc0FjY2VsZXJhdGVkQ2FudmFzKCZy ZW5kZXJlcigpKSkKKworI2lmIEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJE X0NBTlZBUykKKyAgICBpZiAocmVuZGVyZXIoKS5pc0NhbnZhcygpICYmIGNhbnZhc0NvbXBvc2l0 aW5nU3RyYXRlZ3kocmVuZGVyZXIoKSkgPT0gQ2FudmFzQXNMYXllckNvbnRlbnRzKQogICAgICAg ICByZXR1cm4gbV9vd25pbmdMYXllci5oYXNCb3hEZWNvcmF0aW9uc09yQmFja2dyb3VuZCgpOwog I2VuZGlmCiAKQEAgLTE4ODMsNyArMTg4OCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpj b250ZW50Q2hhbmdlZChDb250ZW50Q2hhbmdlVHlwZSBjaGFuZ2VUeXBlKQogICAgIH0KIAogI2lm IEVOQUJMRShXRUJHTCkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKLSAgICBpZiAo KGNoYW5nZVR5cGUgPT0gQ2FudmFzQ2hhbmdlZCB8fCBjaGFuZ2VUeXBlID09IENhbnZhc1BpeGVs c0NoYW5nZWQpICYmIGlzQWNjZWxlcmF0ZWRDYW52YXMoJnJlbmRlcmVyKCkpKSB7CisgICAgaWYg KChjaGFuZ2VUeXBlID09IENhbnZhc0NoYW5nZWQgfHwgY2hhbmdlVHlwZSA9PSBDYW52YXNQaXhl bHNDaGFuZ2VkKSAmJiByZW5kZXJlcigpLmlzQ2FudmFzKCkgJiYgY2FudmFzQ29tcG9zaXRpbmdT dHJhdGVneShyZW5kZXJlcigpKSA9PSBDYW52YXNBc0xheWVyQ29udGVudHMpIHsKICAgICAgICAg bV9ncmFwaGljc0xheWVyLT5zZXRDb250ZW50c05lZWRzRGlzcGxheSgpOwogICAgICAgICByZXR1 cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCmluZGV4IDYxNzk2ODdiNjFkYjAxZmE4Y2ZiMzQ3NWZkZDNlZGU1NGViMTVkNTEuLjNiM2Yw YjEwNzhkMGE2MGNhNzY5MGU3ZWI1NmFlMTllOWEyZWIxMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTMyOCw2ICszMjgsMTMgQEAgcHJp dmF0ZToKICAgICBzdGF0aWMgYm9vbCBtX2NyZWF0aW5nUHJpbWFyeUdyYXBoaWNzTGF5ZXI7CiB9 OwogCitlbnVtIENhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kgeworICAgIFVuYWNjZWxlcmF0ZWRD YW52YXMsCisgICAgQ2FudmFzUGFpbnRlZFRvTGF5ZXIsCisgICAgQ2FudmFzQXNMYXllckNvbnRl bnRzCit9OworQ2FudmFzQ29tcG9zaXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0 ZWd5KGNvbnN0IFJlbmRlck9iamVjdCYpOworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDYxZTQ5ZGE2YmRh M2I5ZWI4NjAwYmY0YmZlZmQzMjZiMWM4NzM3YjEuLmExZjQ2ZGFiYTllNzk0M2QzMzYwZjVkNWRl NmE2ZDE0NDMxYzhhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yMjYzLDEzICsyMjYzLDE0IEBAIGJvb2wgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKFJlbmRlckxheWVy TW9kZWxPYmplY3QmCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChyZW5kZXJlci5p c0NhbnZhcygpKSB7Ci0gICAgICAgIEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMgPSB0b0hUTUxD YW52YXNFbGVtZW50KHJlbmRlcmVyLmVsZW1lbnQoKSk7CiAjaWYgVVNFKENPTVBPU0lUSU5HX0ZP Ul9TTUFMTF9DQU5WQVNFUykKICAgICAgICAgYm9vbCBpc0NhbnZhc0xhcmdlRW5vdWdoVG9Gb3Jj ZUNvbXBvc2l0aW5nID0gdHJ1ZTsKICNlbHNlCisgICAgICAgIEhUTUxDYW52YXNFbGVtZW50KiBj YW52YXMgPSB0b0hUTUxDYW52YXNFbGVtZW50KHJlbmRlcmVyLmVsZW1lbnQoKSk7CiAgICAgICAg IGJvb2wgaXNDYW52YXNMYXJnZUVub3VnaFRvRm9yY2VDb21wb3NpdGluZyA9IGNhbnZhcy0+c2l6 ZSgpLmFyZWEoKSA+PSBjYW52YXNBcmVhVGhyZXNob2xkUmVxdWlyaW5nQ29tcG9zaXRpbmc7CiAj ZW5kaWYKLSAgICAgICAgcmV0dXJuIGNhbnZhcy0+cmVuZGVyaW5nQ29udGV4dCgpICYmIGNhbnZh cy0+cmVuZGVyaW5nQ29udGV4dCgpLT5pc0FjY2VsZXJhdGVkKCkgJiYgKGNhbnZhcy0+cmVuZGVy aW5nQ29udGV4dCgpLT5pczNkKCkgfHwgaXNDYW52YXNMYXJnZUVub3VnaFRvRm9yY2VDb21wb3Np dGluZyk7CisgICAgICAgIENhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kgY29tcG9zaXRpbmdTdHJh dGVneSA9IGNhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3kocmVuZGVyZXIpOworICAgICAgICByZXR1 cm4gY29tcG9zaXRpbmdTdHJhdGVneSA9PSBDYW52YXNBc0xheWVyQ29udGVudHMgfHwgKGNvbXBv c2l0aW5nU3RyYXRlZ3kgPT0gQ2FudmFzUGFpbnRlZFRvTGF5ZXIgJiYgaXNDYW52YXNMYXJnZUVu b3VnaFRvRm9yY2VDb21wb3NpdGluZyk7CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwo=