123418 2013-10-28 13:55:11 -0700 Make TileController create the appropriate PlatformCALayer subclasses 2013-10-28 19:44:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 123422 1 thorton thorton andersca commit-queue eric.carlson glenn jer.noble simon.fraser oldest_to_newest 944205 0 thorton 2013-10-28 13:55:11 -0700 Right now it always makes PlatformCALayerMac, but it should instead ask its owning GraphicsLayer to make an appropriate PlatformCALayer, be it Mac, Win, or Remote. 944210 1 215332 thorton 2013-10-28 14:07:21 -0700 Created attachment 215332 patch Not sure if I should move LayerType enum to a different file to get rid of this nasty casting, or if there's a better solution. 944285 2 215355 thorton 2013-10-28 17:59:08 -0700 Created attachment 215355 patch 944293 3 215355 simon.fraser 2013-10-28 18:24:04 -0700 Comment on attachment 215355 patch Let's call it "compatible". 944302 4 thorton 2013-10-28 19:44:00 -0700 http://trac.webkit.org/changeset/158160 215332 2013-10-28 14:07:21 -0700 2013-10-28 17:59:08 -0700 patch layertype.diff text/plain 12332 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiN2Y2N2IxLi5iN2UxZTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkg QEAKIDIwMTMtMTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgTWFrZSBUaWxlQ29udHJvbGxlciBjcmVhdGUgdGhlIGFwcHJvcHJpYXRlIFBsYXRm b3JtQ0FMYXllciBzdWJjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjM0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICBFeHBvcnQgcGxhdGZvcm1D QUxheWVyQ3JlYXRlQ29tcGF0aWJsZUxheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev UGxhdGZvcm1DQUxheWVyQ2xpZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlz dWFsQ29udGV4dC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVD b250cm9sbGVyLmg6CisgICAgICAgIEFkZCBwbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxl TGF5ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0Eu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJD cmVhdGVDb21wYXRpYmxlTGF5ZXIpOgorICAgICAgICBJbXBsZW1lbnQgcGxhdGZvcm1DQUxheWVy Q3JlYXRlQ29tcGF0aWJsZUxheWVyLiBJdCBkb2Vzbid0IGFjdHVhbGx5CisgICAgICAgIHRha2Ug aW50byBhY2NvdW50IGFueSBwcm9wZXJ0aWVzIG9mIHRoZSBQbGF0Zm9ybUNBTGF5ZXIsIGJ1dCBp bnN0ZWFkCisgICAgICAgIGNyZWF0ZXMgYSBQbGF0Zm9ybUNBTGF5ZXIgb2YgdGhlIHNhbWUgdHlw ZSB0aGF0IHRoYXQgR3JhcGhpY3NMYXllckNBCisgICAgICAgIHdvdWxkIGhhdmUgbWFkZSBhdCBh bnkgb3RoZXIgdGltZSAoaS5lLiBlYWNoIEdyYXBoaWNzTGF5ZXJDQSBvbmx5IGV2ZXIKKyAgICAg ICAgZGVhbHMgaW4gb25lIHR5cGUgb2YgUGxhdGZvcm1DQUxheWVyKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbToKKyAgICAgICAgV2UgZG9u J3QgaGF2ZSB0byBpbmNsdWRlIFBsYXRmb3JtQ0FMYXllck1hYyBhbnltb3JlIQorCisgICAgICAg IChXZWJDb3JlOjpUaWxlQ29udHJvbGxlcjo6VGlsZUNvbnRyb2xsZXIpOgorICAgICAgICAoV2Vi Q29yZTo6VGlsZUNvbnRyb2xsZXI6OnBsYXRmb3JtQ0FMYXllclBhaW50Q29udGVudHMpOgorICAg ICAgICAoV2ViQ29yZTo6VGlsZUNvbnRyb2xsZXI6OnRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yTGF5 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNvbnRyb2xsZXI6OmNyZWF0ZVRpbGVMYXllcik6 CisgICAgICAgIE1ha2UgdXNlIG9mIHBsYXRmb3JtQ0FMYXllckNyZWF0ZUNvbXBhdGlibGVMYXll ci4KKworMjAxMy0xMC0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K KwogICAgICAgICBNYWtlIFRpbGVDb250cm9sbGVyIG1hbmlwdWxhdGUgUGxhdGZvcm1DQUxheWVy cyBpbnN0ZWFkIG9mIENBTGF5ZXJzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjMyNzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCAxYjIxY2VlLi5j OWJiNjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNTQ0LDYgKzU0NCw3IEBAIF9fWk43V2Vi Q29yZTE1R3JhcGhpY3NMYXllckNBMjhwbGF0Zm9ybUNBTGF5ZXJQYWludENvbnRlbnRzRVBOU18x NVBsYXRmb3JtQ0FMYXllCiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJDQTMwZGV2aWNlT3JQ YWdlU2NhbGVGYWN0b3JDaGFuZ2VkRXYKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NMYXllckNBMzFw bGF0Zm9ybUNBTGF5ZXJBbmltYXRpb25TdGFydGVkRWQKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NM YXllckNBMzJwbGF0Zm9ybUNBTGF5ZXJEZXZpY2VTY2FsZUZhY3RvckV2CitfX1pON1dlYkNvcmUx NUdyYXBoaWNzTGF5ZXJDQTM2cGxhdGZvcm1DQUxheWVyQ3JlYXRlQ29tcGF0aWJsZUxheWVyRVBO U18xNVBsYXRmb3JtQ0FMYXllckVqUE5TXzIxUGxhdGZvcm1DQUxheWVyQ2xpZW50RQogX19aTjdX ZWJDb3JlMTVHcmFwaGljc0xheWVyQ0EzN2ZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXll ck9ubHlFdgogX19aTjdXZWJDb3JlMTVHcmFwaGljc0xheWVyQ0E0MHBsYXRmb3JtQ0FMYXllclNl dE5lZWRzVG9SZXZhbGlkYXRlVGlsZXNFdgogX19aTjdXZWJDb3JlMTVHcmFwaGljc0xheWVyQ0E3 c2V0TmFtZUVSS04zV1RGNlN0cmluZ0UKQEAgLTE4MTgsNiArMTgxOSw3IEBAIF9fWlRobj8/P19O N1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJDQTMxcGxhdGZvcm1DQUxheWVyQW5pbWF0aW9uU3RhcnRl ZEVkCiBfX1pUaG4/Pz9fTjdXZWJDb3JlMTVHcmFwaGljc0xheWVyQ0EzMnBsYXRmb3JtQ0FMYXll ckRldmljZVNjYWxlRmFjdG9yRXYKIF9fWlRobj8/P19ON1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJD QTQwcGxhdGZvcm1DQUxheWVyU2V0TmVlZHNUb1JldmFsaWRhdGVUaWxlc0V2CiBfX1pUaG4/Pz9f Tks3V2ViQ29yZTE1R3JhcGhpY3NMYXllckNBMzNwbGF0Zm9ybUNBTGF5ZXJTaG93UmVwYWludENv dW50ZXJFUE5TXzE1UGxhdGZvcm1DQUxheWVyRQorX19aVGhuPz8/X043V2ViQ29yZTE1R3JhcGhp Y3NMYXllckNBMzZwbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxlTGF5ZXJFUE5TXzE1UGxh dGZvcm1DQUxheWVyRWpQTlNfMjFQbGF0Zm9ybUNBTGF5ZXJDbGllbnRFCiBfZmlsZW5hbWVCeUZp eGluZ0lsbGVnYWxDaGFyYWN0ZXJzCiBfaGFzQ2FzZUluc2Vuc2l0aXZlUHJlZml4CiBfaGFzQ2Fz ZUluc2Vuc2l0aXZlU3Vic3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u Q0YuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2Nm L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAppbmRleCA4MTRjMjVlLi44N2Rh ZTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25DRi5jcHAKQEAgLTE5NSw2ICsxOTUsOCBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3BsYXkoUGxhdGZvcm1MYXll ciopIHsgfQogICAgIHZpcnR1YWwgZmxvYXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0 b3IoKSB7IHJldHVybiAxOyB9CiAKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxh eWVyPiBwbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxlTGF5ZXIoUGxhdGZvcm1DQUxheWVy KiwgdW5zaWduZWQsIFBsYXRmb3JtQ0FMYXllckNsaWVudCopIE9WRVJSSURFIHsgcmV0dXJuIG51 bGxwdHI7IH0KKwogICAgIEFWRldyYXBwZXIqIG1fcGFyZW50OwogfTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAK aW5kZXggZTA3OWUxNi4uZDZmYzkxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC0xMjMzLDYgKzEyMzMs MTEgQEAgZmxvYXQgR3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJEZXZpY2VTY2FsZUZh Y3RvcigpCiAgICAgcmV0dXJuIGRldmljZVNjYWxlRmFjdG9yKCk7CiB9CiAKK1Bhc3NSZWZQdHI8 UGxhdGZvcm1DQUxheWVyPiBHcmFwaGljc0xheWVyQ0E6OnBsYXRmb3JtQ0FMYXllckNyZWF0ZUNv bXBhdGlibGVMYXllcihQbGF0Zm9ybUNBTGF5ZXIqLCB1bnNpZ25lZCBsYXllclR5cGUsIFBsYXRm b3JtQ0FMYXllckNsaWVudCogY2xpZW50KQoreworICAgIHJldHVybiBjcmVhdGVQbGF0Zm9ybUNB TGF5ZXIoc3RhdGljX2Nhc3Q8UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGU+KGxheWVyVHlwZSks IGNsaWVudCk7Cit9CisKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpjb21taXRMYXllckNoYW5nZXNC ZWZvcmVTdWJsYXllcnMoQ29tbWl0U3RhdGUmIGNvbW1pdFN0YXRlLCBmbG9hdCBwYWdlU2NhbGVG YWN0b3IsIGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uUmVsYXRpdmVUb0Jhc2UsIGNvbnN0IEZs b2F0UmVjdCYgb2xkVmlzaWJsZVJlY3QsIFRyYW5zZm9ybWF0aW9uTWF0cml4KiB0cmFuc2Zvcm1G cm9tUm9vdCkKIHsKICAgICArK2NvbW1pdFN0YXRlLnRyZWVEZXB0aDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKaW5kZXgg OTYzZGMzNS4uN2EyZDY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTE3Nyw2ICsxNzcsOSBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3BsYXkoUGxhdGZv cm1MYXllciogbGF5ZXIpIHsgcmV0dXJuIGxheWVyRGlkRGlzcGxheShsYXllcik7IH0KICAgICB2 aXJ0dWFsIHZvaWQgcGxhdGZvcm1DQUxheWVyU2V0TmVlZHNUb1JldmFsaWRhdGVUaWxlcygpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgZmxvYXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0 b3IoKSBPVkVSUklERTsKKworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+ IHBsYXRmb3JtQ0FMYXllckNyZWF0ZUNvbXBhdGlibGVMYXllcihQbGF0Zm9ybUNBTGF5ZXIqLCB1 bnNpZ25lZCwgUGxhdGZvcm1DQUxheWVyQ2xpZW50KikgT1ZFUlJJREU7CisKICAgICB2aXJ0dWFs IGJvb2wgaXNDb21taXR0aW5nQ2hhbmdlcygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1faXND b21taXR0aW5nQ2hhbmdlczsgfQogCiAgICAgdmlydHVhbCBkb3VibGUgYmFja2luZ1N0b3JlTWVt b3J5RXN0aW1hdGUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKaW5kZXggZDg1MDMxNS4u Zjc5NWUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev UGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNs dWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1DQUFuaW1hdGlvbi5oIgorI2luY2x1ZGUgIlBsYXRmb3JtQ0FMYXllci5o IgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4K ICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgpAQCAtNjIsNiArNjMsOCBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCB2b2lkIHBsYXRmb3JtQ0FMYXllclNldE5lZWRzVG9SZXZhbGlkYXRlVGlsZXMo KSB7IH0KICAgICB2aXJ0dWFsIGZsb2F0IHBsYXRmb3JtQ0FMYXllckRldmljZVNjYWxlRmFjdG9y KCkgPSAwOwogCisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gcGxhdGZv cm1DQUxheWVyQ3JlYXRlQ29tcGF0aWJsZUxheWVyKFBsYXRmb3JtQ0FMYXllciosIHVuc2lnbmVk LCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqKSA9IDA7CisKICAgICB2aXJ0dWFsIGJvb2wgaXNDb21t aXR0aW5nQ2hhbmdlcygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKIHByb3RlY3RlZDoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29u dHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVD b250cm9sbGVyLmgKaW5kZXggZGQyMzNiZi4uMjAyMmI0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLmgKQEAg LTE0MSw2ICsxNDEsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5 ZXJTZXROZWVkc1RvUmV2YWxpZGF0ZVRpbGVzKCkgT1ZFUlJJREUgeyB9CiAgICAgdmlydHVhbCBm bG9hdCBwbGF0Zm9ybUNBTGF5ZXJEZXZpY2VTY2FsZUZhY3RvcigpIE9WRVJSSURFOwogCisgICAg dmlydHVhbCBQYXNzUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gcGxhdGZvcm1DQUxheWVyQ3JlYXRl Q29tcGF0aWJsZUxheWVyKFBsYXRmb3JtQ0FMYXllciosIHVuc2lnbmVkLCBQbGF0Zm9ybUNBTGF5 ZXJDbGllbnQqKSBPVkVSUklERSB7IHJldHVybiBudWxscHRyOyB9CisKICAgICBJbnRSZWN0IGJv dW5kcygpIGNvbnN0OwogCiAgICAgSW50UmVjdCByZWN0Rm9yVGlsZUluZGV4KGNvbnN0IFRpbGVJ bmRleCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLm1tCmluZGV4IDkxNjBiMzIuLjY4ZjY3ZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29u dHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMv VGlsZUNvbnRyb2xsZXIubW0KQEAgLTI4LDcgKzI4LDYgQEAKIAogI2ltcG9ydCAiSW50UmVjdC5o IgogI2ltcG9ydCAiUGxhdGZvcm1DQUxheWVyLmgiCi0jaW1wb3J0ICJQbGF0Zm9ybUNBTGF5ZXJN YWMuaCIKICNpbXBvcnQgIlJlZ2lvbi5oIgogI2ltcG9ydCAiTGF5ZXJQb29sLmgiCiAjaW1wb3J0 ICJXZWJMYXllci5oIgpAQCAtNzAsNyArNjksNyBAQCBUaWxlQ29udHJvbGxlcjo6VGlsZUNvbnRy b2xsZXIoUGxhdGZvcm1DQUxheWVyKiByb290UGxhdGZvcm1MYXllcikKICAgICAsIG1fdGlsZURl YnVnQm9yZGVyV2lkdGgoMCkKICAgICAsIG1faW5kaWNhdG9yTW9kZShUaHJlYWRlZFNjcm9sbGlu Z0luZGljYXRpb24pCiB7Ci0gICAgbV90aWxlQ29udGFpbmVyTGF5ZXIgPSBQbGF0Zm9ybUNBTGF5 ZXJNYWM6OmNyZWF0ZShQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZUxheWVyLCBudWxscHRyKTsK KyAgICBtX3RpbGVDb250YWluZXJMYXllciA9IG93bmluZ0dyYXBoaWNzTGF5ZXIoKS0+cGxhdGZv cm1DQUxheWVyQ3JlYXRlQ29tcGF0aWJsZUxheWVyKG1fdGlsZUNhY2hlTGF5ZXIsIFBsYXRmb3Jt Q0FMYXllcjo6TGF5ZXJUeXBlTGF5ZXIsIG51bGxwdHIpOwogI2lmbmRlZiBOREVCVUcKICAgICBt X3RpbGVDb250YWluZXJMYXllci0+c2V0TmFtZSgiVGlsZUNvbnRyb2xsZXIgQ29udGFpbmVyIExh eWVyIik7CiAjZW5kaWYKQEAgLTg5NCwxNCArODkzLDE0IEBAIEludFJlY3QgVGlsZUNvbnRyb2xs ZXI6OnRpbGVDb3ZlcmFnZVJlY3QoKSBjb25zdAogUGxhdGZvcm1DQUxheWVyKiBUaWxlQ29udHJv bGxlcjo6dGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllcigpCiB7CiAgICAgaWYgKCFtX3RpbGVk U2Nyb2xsaW5nSW5kaWNhdG9yTGF5ZXIpIHsKLSAgICAgICAgbV90aWxlZFNjcm9sbGluZ0luZGlj YXRvckxheWVyID0gUGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGUoUGxhdGZvcm1DQUxheWVyOjpM YXllclR5cGVTaW1wbGVMYXllciwgdGhpcyk7CisgICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRp Y2F0b3JMYXllciA9IG93bmluZ0dyYXBoaWNzTGF5ZXIoKS0+cGxhdGZvcm1DQUxheWVyQ3JlYXRl Q29tcGF0aWJsZUxheWVyKG1fdGlsZUNhY2hlTGF5ZXIsIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJU eXBlU2ltcGxlTGF5ZXIsIHRoaXMpOwogICAgICAgICBtX3RpbGVkU2Nyb2xsaW5nSW5kaWNhdG9y TGF5ZXItPnNldE9wYWNpdHkoMC43NSk7CiAgICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0 b3JMYXllci0+c2V0QW5jaG9yUG9pbnQoRmxvYXRQb2ludDNEKCkpOwogICAgICAgICBtX3RpbGVk U2Nyb2xsaW5nSW5kaWNhdG9yTGF5ZXItPnNldEJvcmRlckNvbG9yKENvbG9yOjpibGFjayk7CiAg ICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllci0+c2V0Qm9yZGVyV2lkdGgoMSk7 CiAgICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllci0+c2V0UG9zaXRpb24oRmxv YXRQb2ludCgyLCAyKSk7CiAKLSAgICAgICAgbV92aXNpYmxlUmVjdEluZGljYXRvckxheWVyID0g UGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGUoUGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVMYXll ciwgbnVsbHB0cik7CisgICAgICAgIG1fdmlzaWJsZVJlY3RJbmRpY2F0b3JMYXllciA9IG93bmlu Z0dyYXBoaWNzTGF5ZXIoKS0+cGxhdGZvcm1DQUxheWVyQ3JlYXRlQ29tcGF0aWJsZUxheWVyKG1f dGlsZUNhY2hlTGF5ZXIsIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlTGF5ZXIsIG51bGxwdHIp OwogICAgICAgICBtX3Zpc2libGVSZWN0SW5kaWNhdG9yTGF5ZXItPnNldEJvcmRlcldpZHRoKDIp OwogICAgICAgICBtX3Zpc2libGVSZWN0SW5kaWNhdG9yTGF5ZXItPnNldEFuY2hvclBvaW50KEZs b2F0UG9pbnQzRCgpKTsKICAgICAgICAgbV92aXNpYmxlUmVjdEluZGljYXRvckxheWVyLT5zZXRC b3JkZXJDb2xvcihDb2xvcigyNTUsIDAsIDApKTsKQEAgLTkzMyw3ICs5MzIsNyBAQCBSZWZQdHI8 UGxhdGZvcm1DQUxheWVyPiBUaWxlQ29udHJvbGxlcjo6Y3JlYXRlVGlsZUxheWVyKGNvbnN0IElu dFJlY3QmIHRpbGVSZWN0KQogICAgICAgICBtX3RpbGVSZXBhaW50Q291bnRzLnJlbW92ZShsYXll ci5nZXQoKSk7CiAgICAgICAgIGxheWVyLT5zZXRPd25lcih0aGlzKTsKICAgICB9IGVsc2UKLSAg ICAgICAgbGF5ZXIgPSBQbGF0Zm9ybUNBTGF5ZXJNYWM6OmNyZWF0ZShQbGF0Zm9ybUNBTGF5ZXI6 OkxheWVyVHlwZVRpbGVkQmFja2luZ1RpbGVMYXllciwgdGhpcyk7CisgICAgICAgIGxheWVyID0g b3duaW5nR3JhcGhpY3NMYXllcigpLT5wbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxlTGF5 ZXIobV90aWxlQ2FjaGVMYXllciwgUGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVUaWxlZEJhY2tp bmdUaWxlTGF5ZXIsIHRoaXMpOwogCiAgICAgbGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9p bnQzRCgpKTsKICAgICBsYXllci0+c2V0Qm91bmRzKEZsb2F0UmVjdChGbG9hdFBvaW50KCksIHRp bGVSZWN0LnNpemUoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1 aWNrVGltZVZpc3VhbENvbnRleHQuY3BwCmluZGV4IDdkZWE3MTMuLmVhZWI4MDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZh dGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlzdWFsQ29udGV4dC5j cHAKQEAgLTExMCw2ICsxMTAsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9y bUNBTGF5ZXJMYXllckRpZERpc3BsYXkoUGxhdGZvcm1MYXllciopIHsgfQogICAgIHZpcnR1YWwg ZmxvYXQgcGxhdGZvcm1DQUxheWVyRGV2aWNlU2NhbGVGYWN0b3IoKSB7IHJldHVybiAxOyB9CiAK KyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBwbGF0Zm9ybUNBTGF5ZXJD cmVhdGVDb21wYXRpYmxlTGF5ZXIoUGxhdGZvcm1DQUxheWVyKiwgdW5zaWduZWQsIFBsYXRmb3Jt Q0FMYXllckNsaWVudCopIE9WRVJSSURFIHsgcmV0dXJuIG51bGxwdHI7IH0KKwogICAgIE1lZGlh UGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQqIG1fcGFyZW50OwogfTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nCmluZGV4IDVjOTNjZjAuLjRiYTliN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNSBAQAogMjAxMy0xMC0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAorICAgICAgICBNYWtlIFRpbGVDb250cm9sbGVyIGNyZWF0ZSB0aGUgYXBwcm9wcmlh dGUgUGxhdGZvcm1DQUxheWVyIHN1YmNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHA6Cisg ICAgICAgIEFkZCBwbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxlTGF5ZXIuCisKKzIwMTMt MTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAg TWFrZSBUaWxlQ29udHJvbGxlciBtYW5pcHVsYXRlIFBsYXRmb3JtQ0FMYXllcnMgaW5zdGVhZCBv ZiBDQUxheWVycwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIzMjc5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0Z1bGxzY3JlZW5WaWRl b0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJv bGxlci5jcHAKaW5kZXggYzE1Y2ZjZC4uNzc3ZTRiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC93 aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKQEAgLTE5OCw2ICsxOTgsOCBAQCBwcml2 YXRlOgogICAgIHZpcnR1YWwgdm9pZCBwbGF0Zm9ybUNBTGF5ZXJEaWRDcmVhdGVUaWxlcyhjb25z dCBWZWN0b3I8RmxvYXRSZWN0PiYpIHsgfQogICAgIHZpcnR1YWwgZmxvYXQgcGxhdGZvcm1DQUxh eWVyRGV2aWNlU2NhbGVGYWN0b3IoKSB7IHJldHVybiAxOyB9CiAKKyAgICB2aXJ0dWFsIFBhc3NS ZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBwbGF0Zm9ybUNBTGF5ZXJDcmVhdGVDb21wYXRpYmxlTGF5 ZXIoUGxhdGZvcm1DQUxheWVyKiwgdW5zaWduZWQsIFBsYXRmb3JtQ0FMYXllckNsaWVudCopIE9W RVJSSURFIHsgcmV0dXJuIG51bGxwdHI7IH0KKwogICAgIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xs ZXIqIG1fcGFyZW50OwogfTsKIAo= 215355 2013-10-28 17:59:08 -0700 2013-10-28 18:24:04 -0700 patch layertype.diff text/plain 9622 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNWMzNzdjLi40MGEyZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTWFrZSBUaWxlQ29udHJvbGxlciBjcmVhdGUgdGhlIGFwcHJvcHJpYXRlIFBsYXRm b3JtQ0FMYXllciBzdWJjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjM0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgUGxhdGZvcm1DQUxheWVyOjpjcmVhdGVTaW1pbGFyTGF5ZXIsIHdo aWNoIGlzIG92ZXJyaWRkZW4gaW4KKyAgICAgICAgZWFjaCBvZiB0aGUgc3ViY2xhc3NlcyB0byBj cmVhdGUgYSBQbGF0Zm9ybUNBTGF5ZXIgaW5zdGFuY2Ugb2YgdGhlIHNhbWUKKyAgICAgICAgc3Vi Y2xhc3MuIFRoaXMgaXMgdXNlZCBpbiBUaWxlQ29udHJvbGxlciB0byBtYWtlIGJhcmUgUGxhdGZv cm1DQUxheWVycworICAgICAgICBvZiB0aGUgY29ycmVjdCB0eXBlIChNYWMsIFdpbiwgb3IgUmVt b3RlKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFj Lm1tOgorICAgICAgICAoUGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGVTaW1pbGFyTGF5ZXIpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW4uY3Bw OgorICAgICAgICAoUGxhdGZvcm1DQUxheWVyV2luOjpjcmVhdGVTaW1pbGFyTGF5ZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW4uaDoKKyAg ICAgICAgQWRkIGNyZWF0ZVNpbWlsYXJMYXllciBhbmQgaW1wbGVtZW50IGl0IGluIHRoZSBzdWJj bGFzc2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9s bGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNvbnRyb2xsZXI6OlRpbGVDb250cm9sbGVy KToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDb250cm9sbGVyOjp0aWxlZFNjcm9sbGluZ0luZGlj YXRvckxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDb250cm9sbGVyOjpjcmVhdGVUaWxl TGF5ZXIpOgorICAgICAgICBNYWtlIHVzZSBvZiBjcmVhdGVTaW1pbGFyTGF5ZXIgd2hlbiBjcmVh dGluZyBQbGF0Zm9ybUNBTGF5ZXJzLgorCiAyMDEzLTEwLTI4ICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgVXBzdHJlYW0gcmVtYWluaW5nIFBMQVRGT1JN KElPUykgYW5kIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKSBwaWVjZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKaW5kZXgg YTA3ZjZiYy4uMjg1NDFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKQEAgLTE5OCw2ICsxOTgsOCBAQCBwdWJsaWM6 CiAjZW5kaWYgLy8gTkRFQlVHCiAjZW5kaWYgLy8gUExBVEZPUk0oV0lOKQogCisgICAgdmlydHVh bCBQYXNzUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gY3JlYXRlU2ltaWxhckxheWVyKExheWVyVHlw ZSwgUGxhdGZvcm1DQUxheWVyQ2xpZW50KikgY29uc3QgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAg UGxhdGZvcm1DQUxheWVyKExheWVyVHlwZSBsYXllclR5cGUsIFBsYXRmb3JtQ0FMYXllckNsaWVu dCogb3duZXIpCiAgICAgICAgIDogbV9sYXllclR5cGUobGF5ZXJUeXBlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1h Yy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FM YXllck1hYy5oCmluZGV4IGIxZWQ4NWQuLjRhMjA2YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFj LmgKQEAgLTEzOSw2ICsxMzksOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8 UGxhdGZvcm1DQUxheWVyPiBjbG9uZShQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyKSBjb25z dCBPVkVSUklERTsKIAorICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+IGNy ZWF0ZVNpbWlsYXJMYXllcihQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSwgUGxhdGZvcm1DQUxh eWVyQ2xpZW50KikgY29uc3QgT1ZFUlJJREU7CisKIHByaXZhdGU6CiAgICAgUGxhdGZvcm1DQUxh eWVyTWFjKExheWVyVHlwZSwgUGxhdGZvcm1MYXllciosIFBsYXRmb3JtQ0FMYXllckNsaWVudCog b3duZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQppbmRleCA5NTRhNzM5Li5iNjY3NjVm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxh dGZvcm1DQUxheWVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KQEAgLTcyOSw0ICs3MjksOSBAQCBBVlBsYXll ckxheWVyICpQbGF0Zm9ybUNBTGF5ZXJNYWM6OnBsYXllckxheWVyKCkgY29uc3QKICAgICByZXR1 cm4gKEFWUGxheWVyTGF5ZXIgKiltX2xheWVyLmdldCgpOwogfQogCitQYXNzUmVmUHRyPFBsYXRm b3JtQ0FMYXllcj4gUGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGVTaW1pbGFyTGF5ZXIoUGxhdGZv cm1DQUxheWVyOjpMYXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIGNs aWVudCkgY29uc3QKK3sKKyAgICByZXR1cm4gUGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGUobGF5 ZXJUeXBlLCBjbGllbnQpOworfQorCiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFj L1RpbGVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev bWFjL1RpbGVDb250cm9sbGVyLm1tCmluZGV4IDkxNjBiMzIuLjY2MjE2ZDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRy b2xsZXIubW0KQEAgLTI4LDcgKzI4LDYgQEAKIAogI2ltcG9ydCAiSW50UmVjdC5oIgogI2ltcG9y dCAiUGxhdGZvcm1DQUxheWVyLmgiCi0jaW1wb3J0ICJQbGF0Zm9ybUNBTGF5ZXJNYWMuaCIKICNp bXBvcnQgIlJlZ2lvbi5oIgogI2ltcG9ydCAiTGF5ZXJQb29sLmgiCiAjaW1wb3J0ICJXZWJMYXll ci5oIgpAQCAtNzAsNyArNjksNyBAQCBUaWxlQ29udHJvbGxlcjo6VGlsZUNvbnRyb2xsZXIoUGxh dGZvcm1DQUxheWVyKiByb290UGxhdGZvcm1MYXllcikKICAgICAsIG1fdGlsZURlYnVnQm9yZGVy V2lkdGgoMCkKICAgICAsIG1faW5kaWNhdG9yTW9kZShUaHJlYWRlZFNjcm9sbGluZ0luZGljYXRp b24pCiB7Ci0gICAgbV90aWxlQ29udGFpbmVyTGF5ZXIgPSBQbGF0Zm9ybUNBTGF5ZXJNYWM6OmNy ZWF0ZShQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZUxheWVyLCBudWxscHRyKTsKKyAgICBtX3Rp bGVDb250YWluZXJMYXllciA9IG1fdGlsZUNhY2hlTGF5ZXItPmNyZWF0ZVNpbWlsYXJMYXllcihQ bGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZUxheWVyLCBudWxscHRyKTsKICNpZm5kZWYgTkRFQlVH CiAgICAgbV90aWxlQ29udGFpbmVyTGF5ZXItPnNldE5hbWUoIlRpbGVDb250cm9sbGVyIENvbnRh aW5lciBMYXllciIpOwogI2VuZGlmCkBAIC04OTQsMTQgKzg5MywxNCBAQCBJbnRSZWN0IFRpbGVD b250cm9sbGVyOjp0aWxlQ292ZXJhZ2VSZWN0KCkgY29uc3QKIFBsYXRmb3JtQ0FMYXllciogVGls ZUNvbnRyb2xsZXI6OnRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yTGF5ZXIoKQogewogICAgIGlmICgh bV90aWxlZFNjcm9sbGluZ0luZGljYXRvckxheWVyKSB7Ci0gICAgICAgIG1fdGlsZWRTY3JvbGxp bmdJbmRpY2F0b3JMYXllciA9IFBsYXRmb3JtQ0FMYXllck1hYzo6Y3JlYXRlKFBsYXRmb3JtQ0FM YXllcjo6TGF5ZXJUeXBlU2ltcGxlTGF5ZXIsIHRoaXMpOworICAgICAgICBtX3RpbGVkU2Nyb2xs aW5nSW5kaWNhdG9yTGF5ZXIgPSBtX3RpbGVDYWNoZUxheWVyLT5jcmVhdGVTaW1pbGFyTGF5ZXIo UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVTaW1wbGVMYXllciwgdGhpcyk7CiAgICAgICAgIG1f dGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllci0+c2V0T3BhY2l0eSgwLjc1KTsKICAgICAgICAg bV90aWxlZFNjcm9sbGluZ0luZGljYXRvckxheWVyLT5zZXRBbmNob3JQb2ludChGbG9hdFBvaW50 M0QoKSk7CiAgICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllci0+c2V0Qm9yZGVy Q29sb3IoQ29sb3I6OmJsYWNrKTsKICAgICAgICAgbV90aWxlZFNjcm9sbGluZ0luZGljYXRvckxh eWVyLT5zZXRCb3JkZXJXaWR0aCgxKTsKICAgICAgICAgbV90aWxlZFNjcm9sbGluZ0luZGljYXRv ckxheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KDIsIDIpKTsKIAotICAgICAgICBtX3Zpc2li bGVSZWN0SW5kaWNhdG9yTGF5ZXIgPSBQbGF0Zm9ybUNBTGF5ZXJNYWM6OmNyZWF0ZShQbGF0Zm9y bUNBTGF5ZXI6OkxheWVyVHlwZUxheWVyLCBudWxscHRyKTsKKyAgICAgICAgbV92aXNpYmxlUmVj dEluZGljYXRvckxheWVyID0gbV90aWxlQ2FjaGVMYXllci0+Y3JlYXRlU2ltaWxhckxheWVyKFBs YXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlTGF5ZXIsIG51bGxwdHIpOwogICAgICAgICBtX3Zpc2li bGVSZWN0SW5kaWNhdG9yTGF5ZXItPnNldEJvcmRlcldpZHRoKDIpOwogICAgICAgICBtX3Zpc2li bGVSZWN0SW5kaWNhdG9yTGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKICAg ICAgICAgbV92aXNpYmxlUmVjdEluZGljYXRvckxheWVyLT5zZXRCb3JkZXJDb2xvcihDb2xvcigy NTUsIDAsIDApKTsKQEAgLTkzMyw3ICs5MzIsNyBAQCBSZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBU aWxlQ29udHJvbGxlcjo6Y3JlYXRlVGlsZUxheWVyKGNvbnN0IEludFJlY3QmIHRpbGVSZWN0KQog ICAgICAgICBtX3RpbGVSZXBhaW50Q291bnRzLnJlbW92ZShsYXllci5nZXQoKSk7CiAgICAgICAg IGxheWVyLT5zZXRPd25lcih0aGlzKTsKICAgICB9IGVsc2UKLSAgICAgICAgbGF5ZXIgPSBQbGF0 Zm9ybUNBTGF5ZXJNYWM6OmNyZWF0ZShQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVRpbGVkQmFj a2luZ1RpbGVMYXllciwgdGhpcyk7CisgICAgICAgIGxheWVyID0gbV90aWxlQ2FjaGVMYXllci0+ Y3JlYXRlU2ltaWxhckxheWVyKFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlVGlsZWRCYWNraW5n VGlsZUxheWVyLCB0aGlzKTsKIAogICAgIGxheWVyLT5zZXRBbmNob3JQb2ludChGbG9hdFBvaW50 M0QoKSk7CiAgICAgbGF5ZXItPnNldEJvdW5kcyhGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCB0aWxl UmVjdC5zaXplKCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbi5jcHAKaW5kZXggNDQ1M2YzZC4u Y2Q2ZGQ5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev d2luL1BsYXRmb3JtQ0FMYXllcldpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbi5jcHAKQEAgLTY3MCw0ICs2NzAsOSBA QCB2b2lkIFBsYXRmb3JtQ0FMYXllcldpbjo6cHJpbnRUcmVlKCkgY29uc3QKIH0KICNlbmRpZiAv LyAjaWZuZGVmIE5ERUJVRwogCitQYXNzUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gUGxhdGZvcm1D QUxheWVyV2luOjpjcmVhdGVTaW1pbGFyTGF5ZXIoUGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGUg bGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIGNsaWVudCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gUGxhdGZvcm1DQUxheWVyV2luOjpjcmVhdGUobGF5ZXJUeXBlLCBjbGllbnQpOworfQor CiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXllcldpbi5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2luL1BsYXRmb3JtQ0FMYXll cldpbi5oCmluZGV4IDYzZWExMDAuLjVmYzQ2ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL3dpbi9QbGF0Zm9ybUNBTGF5ZXJXaW4uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vUGxhdGZvcm1DQUxheWVyV2luLmgK QEAgLTE0MCw2ICsxNDAsOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UGxh dGZvcm1DQUxheWVyPiBjbG9uZShQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyKSBjb25zdCBP VkVSUklERTsKIAorICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxQbGF0Zm9ybUNBTGF5ZXI+IGNyZWF0 ZVNpbWlsYXJMYXllcihQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVy Q2xpZW50KikgY29uc3QgT1ZFUlJJREU7CisKIHByaXZhdGU6CiAgICAgUGxhdGZvcm1DQUxheWVy V2luKExheWVyVHlwZSwgUGxhdGZvcm1MYXllciosIFBsYXRmb3JtQ0FMYXllckNsaWVudCogb3du ZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDg1MTIxYy4uNWY2MWM3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE1IEBACisyMDEzLTEwLTI4ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgVGlsZUNvbnRyb2xsZXIgY3JlYXRlIHRoZSBhcHByb3ByaWF0 ZSBQbGF0Zm9ybUNBTGF5ZXIgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FM YXllclJlbW90ZS5jcHA6CisgICAgICAgIChQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OmNyZWF0ZVNp bWlsYXJMYXllcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNB TGF5ZXJSZW1vdGUuaDoKKyAgICAgICAgQWRkIGNyZWF0ZVNpbWlsYXJMYXllciBhbmQgaW1wbGVt ZW50IGl0IGluIHRoZSBzdWJjbGFzc2VzLgorCiAyMDEzLTEwLTI4ICBCZW5qYW1pbiBQb3VsYWlu ICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZW5hbWUgYXBwbHlQYWdlU2NhbGVG YWN0b3JJbkNvbXBvc2l0b3IgdG8gZGVsZWdhdGVzUGFnZVNjYWxpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3Rl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxh eWVyUmVtb3RlLmNwcAppbmRleCA4MThiZDc1Li5hMzljMDI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5 ZXJSZW1vdGUuY3BwCkBAIC00NzcsNCArNDc3LDkgQEAgQVZQbGF5ZXJMYXllciogUGxhdGZvcm1D QUxheWVyUmVtb3RlOjpwbGF5ZXJMYXllcigpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9 CiAKK1Bhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OmNy ZWF0ZVNpbWlsYXJMYXllcihQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSBsYXllclR5cGUsIFBs YXRmb3JtQ0FMYXllckNsaWVudCogY2xpZW50KSBjb25zdAoreworICAgIHJldHVybiBQbGF0Zm9y bUNBTGF5ZXJSZW1vdGU6OmNyZWF0ZShsYXllclR5cGUsIGNsaWVudCwgbV9jb250ZXh0KTsKK30K KwogI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3Rl LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXll clJlbW90ZS5oCmluZGV4IDA5ZTA4YzcuLmRlMmQ5MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1v dGUuaApAQCAtMTQzLDYgKzE0Myw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0 cjxXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI+IGNsb25lKFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXll ckNsaWVudCogb3duZXIpIGNvbnN0IE9WRVJSSURFOwogCisgICAgdmlydHVhbCBQYXNzUmVmUHRy PFBsYXRmb3JtQ0FMYXllcj4gY3JlYXRlU2ltaWxhckxheWVyKFdlYkNvcmU6OlBsYXRmb3JtQ0FM YXllcjo6TGF5ZXJUeXBlLCBXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqKSBjb25zdCBP VkVSUklERTsKKwogcHJpdmF0ZToKICAgICBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUoV2ViQ29yZTo6 UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGUsIFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXllckNsaWVu dCogb3duZXIsIFJlbW90ZUxheWVyVHJlZUNvbnRleHQqIGNvbnRleHQpOwogCg==