87058 2012-05-21 16:46:23 -0700 Add PaintBehaviorDontClipOverflow for Android 2012-05-22 09:54:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 66687 1 abarth abarth eric jamesr klobag peter skyostil oldest_to_newest 629713 0 abarth 2012-05-21 16:46:23 -0700 Add PaintBehaviorDontClipOverflow for Android 629714 1 143134 abarth 2012-05-21 16:47:22 -0700 Created attachment 143134 work in progress 629722 2 143136 abarth 2012-05-21 16:55:59 -0700 Created attachment 143136 Android changes to RenderLayerBacking.cpp @skyostil: I'm having trouble finishing this patch because it's related to changes to RenderLayerBacking.cpp, which I've attached. In particular, I'm having trouble creating a patch out of the changes to RenderLayerBacking::paintContents. Would you be willing to help me with that part? Thanks! 629725 3 abarth 2012-05-21 16:56:22 -0700 +jamesr because this is getting close to the compositor. 629731 4 eric 2012-05-21 17:01:44 -0700 OK. We just need to know why you'd ever want this behavior. :) 630150 5 skyostil 2012-05-22 03:05:11 -0700 I have a WIP patch that completely reworks the way clipping is handled for compositor scrollable layers and fixes several bugs in the process. I was planning to land it as a part of https://bugs.webkit.org/show_bug.cgi?id=78862. I suggest we don't try merging in anything scrolling related for now from the Android diffs because all of that has changed quite a bit. 630471 6 abarth 2012-05-22 09:54:58 -0700 Thanks Sami. 143134 2012-05-21 16:47:22 -0700 2012-05-21 16:47:22 -0700 work in progress bug-87058-20120521164720.patch text/plain 6927 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRlYWExMDM5ZjIwM2Nl Mzk2Y2Q4NDQwNzVkMmVlZTQ3ZmJjYmUxOC4uNmQ3MGM4YTgzNDU0YTU0NWQzZGNjNmVmMTljZWMw MjZhYzAwN2M5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTIxICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFBhaW50QmVoYXZpb3JE b250Q2xpcE92ZXJmbG93IGZvciBBbmRyb2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NzA1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgIE5vIG9u ZSBzZXRzIHRoaXMgYml0IHlldCEgIChPT1BTISkKKworICAgICAgICAqIHJlbmRlcmluZy9QYWlu dFBoYXNlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aDoKKwogMjAxMi0wNS0yMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWZhY3RvciByZXZpc2lvbiBoaXN0b3J5IHRvIG5v dCBpbmNsdWRlIHJlc291cmNlIGl0c2VsZi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9QYWludFBoYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRQaGFz ZS5oCmluZGV4IGJlNGM2MWJlNGE2MzU4YjYxMmI2NDU1YWY4ZjY2ZTJlODBiNmJkZGEuLmU1OTll N2NmNGIyZDNkNGE3MDEzMTc5OWU4YzE4MjIwYjYyZDI4Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9QYWludFBoYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1BhaW50UGhhc2UuaApAQCAtNTcsNyArNTcsOCBAQCBlbnVtIFBhaW50QmVoYXZpb3JGbGFn cyB7CiAgICAgUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9ubHkgPSAxIDw8IDAsCiAgICAgUGFpbnRC ZWhhdmlvckZvcmNlQmxhY2tUZXh0ID0gMSA8PCAxLAogICAgIFBhaW50QmVoYXZpb3JGbGF0dGVu Q29tcG9zaXRpbmdMYXllcnMgPSAxIDw8IDIsCi0gICAgUGFpbnRCZWhhdmlvclJlbmRlcmluZ1NW R01hc2sgPSAxIDw8IDMKKyAgICBQYWludEJlaGF2aW9yUmVuZGVyaW5nU1ZHTWFzayA9IDEgPDwg MywKKyAgICBQYWludEJlaGF2aW9yRG9udENsaXBPdmVyZmxvdyA9IDEgPDwgNAogfTsKIAogdHlw ZWRlZiB1bnNpZ25lZCBQYWludEJlaGF2aW9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKaW5kZXggYTgyZDkzNjlkNjM1ZWI2MTAzMGVkYWQ0MTU3NmQ1ZDE0NGQ2M2Y5 Yi4uMjk2ZjhhYTYxOGY5OGYyZTZhZDM0NjhlMTI2NGEzZjE5Zjg3NDE2NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yOTM2LDcgKzI5MzYsOCBAQCB2b2lk IFJlbmRlckxheWVyOjpwYWludExheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwKICAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBwYXJlbnQncyBjbGlw IHJlY3RzIGhhdmUgYmVlbiBjYWxjdWxhdGVkLgogICAgICAgICBDbGlwUmVjdCBjbGlwUmVjdCA9 IHBhaW50RGlydHlSZWN0OwogICAgICAgICBpZiAocGFyZW50KCkpIHsKLSAgICAgICAgICAgIGNs aXBSZWN0ID0gYmFja2dyb3VuZENsaXBSZWN0KHJvb3RMYXllciwgcmVnaW9uLCBwYWludEZsYWdz ICYgUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0cyk7CisgICAgICAgICAgICBpZiAoIShwYWlu dEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvckRvbnRDbGlwT3ZlcmZsb3cpKQorICAgICAgICAgICAg ICAgIGNsaXBSZWN0ID0gYmFja2dyb3VuZENsaXBSZWN0KHJvb3RMYXllciwgcmVnaW9uLCBwYWlu dEZsYWdzICYgUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0cyk7CiAgICAgICAgICAgICBjbGlw UmVjdC5pbnRlcnNlY3QocGFpbnREaXJ0eVJlY3QpOwogICAgICAgICAKICAgICAgICAgICAgIC8v IFB1c2ggdGhlIHBhcmVudCBjb29yZGluYXRlIHNwYWNlJ3MgY2xpcC4KQEAgLTMwNDUsNyArMzA0 Niw4IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhSZW5kZXJMYXllciog cm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqIGNvCiAjZW5kaWYKICAgICAKICAgICBpZiAoc2hv dWxkUGFpbnRDb250ZW50IHx8IHNob3VsZFBhaW50T3V0bGluZSB8fCBpc1BhaW50aW5nT3Zlcmxh eVNjcm9sbGJhcnMpIHsKLSAgICAgICAgY2FsY3VsYXRlUmVjdHMocm9vdExheWVyLCByZWdpb24s IHBhaW50RGlydHlSZWN0LCBsYXllckJvdW5kcywgZGFtYWdlUmVjdCwgY2xpcFJlY3RUb0FwcGx5 LCBvdXRsaW5lUmVjdCwgbG9jYWxQYWludEZsYWdzICYgUGFpbnRMYXllclRlbXBvcmFyeUNsaXBS ZWN0cyk7CisgICAgICAgIGNhbGN1bGF0ZVJlY3RzKHJvb3RMYXllciwgcmVnaW9uLCBwYWludERp cnR5UmVjdCwgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIGNsaXBSZWN0VG9BcHBseSwgb3V0bGlu ZVJlY3QsCisgICAgICAgICAgICAgICAgICAgICAgIGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5 ZXJUZW1wb3JhcnlDbGlwUmVjdHMsIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCAhKHBhaW50 QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yRG9udENsaXBPdmVyZmxvdykpOwogICAgICAgICBwYWlu dE9mZnNldCA9IHRvUG9pbnQobGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlckJveExvY2F0 aW9uKCkpOwogICAgIH0KIApAQCAtMzA2NCw4ICszMDY2LDkgQEAgdm9pZCBSZW5kZXJMYXllcjo6 cGFpbnRMYXllckNvbnRlbnRzKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4 dCogY28KICAgICAgICAgcGVyZm9ybU92ZXJsYXBUZXN0cygqb3ZlcmxhcFRlc3RSZXF1ZXN0cywg cm9vdExheWVyLCB0aGlzKTsKIAogICAgIC8vIFdlIHdhbnQgdG8gcGFpbnQgb3VyIGxheWVyLCBi dXQgb25seSBpZiB3ZSBpbnRlcnNlY3QgdGhlIGRhbWFnZSByZWN0LgotICAgIHNob3VsZFBhaW50 Q29udGVudCAmPSBpbnRlcnNlY3RzRGFtYWdlUmVjdChsYXllckJvdW5kcywgZGFtYWdlUmVjdC5y ZWN0KCksIHJvb3RMYXllcik7Ci0gICAgCisgICAgaWYgKCEocGFpbnRCZWhhdmlvciAmIFBhaW50 QmVoYXZpb3JEb250Q2xpcE92ZXJmbG93KSkKKyAgICAgICAgc2hvdWxkUGFpbnRDb250ZW50ICY9 IGludGVyc2VjdHNEYW1hZ2VSZWN0KGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LnJlY3QoKSwgcm9v dExheWVyKTsKKwogICAgIGlmIChsb2NhbFBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdD b21wb3NpdGluZ0JhY2tncm91bmRQaGFzZSkgewogICAgICAgICBpZiAoc2hvdWxkUGFpbnRDb250 ZW50ICYmICFzZWxlY3Rpb25Pbmx5KSB7CiAgICAgICAgICAgICAvLyBCZWdpbiB0cmFuc3BhcmVu Y3kgbGF5ZXJzIGxhemlseSBub3cgdGhhdCB3ZSBrbm93IHdlIGhhdmUgdG8gcGFpbnQgc29tZXRo aW5nLgpAQCAtMzkzMCw5ICszOTMzLDkgQEAgQ2xpcFJlY3QgUmVuZGVyTGF5ZXI6OmJhY2tncm91 bmRDbGlwUmVjdChjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJSZWcKIAogdm9p ZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlUmVjdHMoY29uc3QgUmVuZGVyTGF5ZXIqIHJvb3RMYXll ciwgUmVuZGVyUmVnaW9uKiByZWdpb24sIGNvbnN0IExheW91dFJlY3QmIHBhaW50RGlydHlSZWN0 LCBMYXlvdXRSZWN0JiBsYXllckJvdW5kcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIENsaXBSZWN0JiBiYWNrZ3JvdW5kUmVjdCwgQ2xpcFJlY3QmIGZvcmVncm91bmRSZWN0LCBD bGlwUmVjdCYgb3V0bGluZVJlY3QsIGJvb2wgdGVtcG9yYXJ5Q2xpcFJlY3RzLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kgcmVs ZXZhbmN5KSBjb25zdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgT3ZlcmxheVNj cm9sbGJhclNpemVSZWxldmFuY3kgcmVsZXZhbmN5LCBib29sIGNsaXBUb092ZXJmbG93KSBjb25z dAogewotICAgIGlmIChyb290TGF5ZXIgIT0gdGhpcyAmJiBwYXJlbnQoKSkgeworICAgIGlmIChy b290TGF5ZXIgIT0gdGhpcyAmJiBwYXJlbnQoKSAmJiBjbGlwVG9PdmVyZmxvdykgewogICAgICAg ICBiYWNrZ3JvdW5kUmVjdCA9IGJhY2tncm91bmRDbGlwUmVjdChyb290TGF5ZXIsIHJlZ2lvbiwg dGVtcG9yYXJ5Q2xpcFJlY3RzLCByZWxldmFuY3kpOwogICAgICAgICBiYWNrZ3JvdW5kUmVjdC5p bnRlcnNlY3QocGFpbnREaXJ0eVJlY3QpOwogICAgIH0gZWxzZQpAQCAtMzk0OCw3ICszOTUxLDcg QEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlUmVjdHMoY29uc3QgUmVuZGVyTGF5ZXIqIHJv b3RMYXllciwgUmVuZGVyUmVnaW9uKiByZWcKICAgICAvLyBVcGRhdGUgdGhlIGNsaXAgcmVjdHMg dGhhdCB3aWxsIGJlIHBhc3NlZCB0byBjaGlsZCBsYXllcnMuCiAgICAgaWYgKHJlbmRlcmVyKCkt Pmhhc092ZXJmbG93Q2xpcCgpIHx8IHJlbmRlcmVyKCktPmhhc0NsaXAoKSkgewogICAgICAgICAv LyBUaGlzIGxheWVyIGVzdGFibGlzaGVzIGEgY2xpcCBvZiBzb21lIGtpbmQuCi0gICAgICAgIGlm IChyZW5kZXJlcigpLT5oYXNPdmVyZmxvd0NsaXAoKSkgeworICAgICAgICBpZiAocmVuZGVyZXIo KS0+aGFzT3ZlcmZsb3dDbGlwKCkgJiBjbGlwVG9PdmVyZmxvdykgewogICAgICAgICAgICAgZm9y ZWdyb3VuZFJlY3QuaW50ZXJzZWN0KHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT5vdmVyZmxvd0Ns aXBSZWN0KG9mZnNldCwgcmVnaW9uLCByZWxldmFuY3kpKTsKICAgICAgICAgICAgIGlmIChyZW5k ZXJlcigpLT5zdHlsZSgpLT5oYXNCb3JkZXJSYWRpdXMoKSkKICAgICAgICAgICAgICAgICBmb3Jl Z3JvdW5kUmVjdC5zZXRIYXNSYWRpdXModHJ1ZSk7CkBAIC0zOTc2LDcgKzM5NzksOCBAQCB2b2lk IFJlbmRlckxheWVyOjpjYWxjdWxhdGVSZWN0cyhjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVy LCBSZW5kZXJSZWdpb24qIHJlZwogICAgICAgICAgICAgLy8gU2hpZnQgdGhlIGJvdW5kcyB0byBi ZSBmb3Igb3VyIHJlZ2lvbiBvbmx5LgogICAgICAgICAgICAgTGF5b3V0UmVjdCBib3VuZHMgPSBw aXhlbFNuYXBwZWRJbnRSZWN0KHJlbmRlckJveCgpLT5ib3JkZXJCb3hSZWN0SW5SZWdpb24ocmVn aW9uKSk7CiAgICAgICAgICAgICBib3VuZHMubW92ZUJ5KG9mZnNldCk7Ci0gICAgICAgICAgICBi YWNrZ3JvdW5kUmVjdC5pbnRlcnNlY3QoYm91bmRzKTsKKyAgICAgICAgICAgIGlmIChjbGlwVG9P dmVyZmxvdykKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kUmVjdC5pbnRlcnNlY3QoYm91bmRz KTsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmgKaW5kZXggODYwYTM3MjkwYWFkZDYxNzljMWQwMTc5YjIxYTAwZDk2ODRmOGQwZS4uM2JlZTBm NWEzYjZjMjM2NGNhMWJjNWE0ZTQ1ZGFiMGUxZDc0NDEwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmgKQEAgLTQ3NCw3ICs0NzQsOCBAQCBwdWJsaWM6CiAgICAgLy8gZm9y IHBhaW50aW5nL2V2ZW50IGhhbmRsaW5nLgogICAgIHZvaWQgY2FsY3VsYXRlUmVjdHMoY29uc3Qg UmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgUmVuZGVyUmVnaW9uKiwgY29uc3QgTGF5b3V0UmVjdCYg cGFpbnREaXJ0eVJlY3QsIExheW91dFJlY3QmIGxheWVyQm91bmRzLAogICAgICAgICAgICAgICAg ICAgICAgICAgQ2xpcFJlY3QmIGJhY2tncm91bmRSZWN0LCBDbGlwUmVjdCYgZm9yZWdyb3VuZFJl Y3QsIENsaXBSZWN0JiBvdXRsaW5lUmVjdCwKLSAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wg dGVtcG9yYXJ5Q2xpcFJlY3RzID0gZmFsc2UsIE92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5 ID0gSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUpIGNvbnN0OworICAgICAgICAgICAgICAgICAg ICAgICAgYm9vbCB0ZW1wb3JhcnlDbGlwUmVjdHMgPSBmYWxzZSwgT3ZlcmxheVNjcm9sbGJhclNp emVSZWxldmFuY3kgPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgIGJvb2wgY2xpcFRvT3ZlcmZsb3cgPSB0cnVlKSBjb25zdDsKIAogICAgIC8vIENv bXB1dGUgYW5kIGNhY2hlIGNsaXAgcmVjdHMgY29tcHV0ZWQgd2l0aCB0aGUgZ2l2ZW4gbGF5ZXIg YXMgdGhlIHJvb3QKICAgICB2b2lkIHVwZGF0ZUNsaXBSZWN0cyhjb25zdCBSZW5kZXJMYXllciog cm9vdExheWVyLCBSZW5kZXJSZWdpb24qLCBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9 IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKTsK 143136 2012-05-21 16:55:59 -0700 2012-05-21 16:55:59 -0700 Android changes to RenderLayerBacking.cpp patch text/plain 14342 abarth ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5k ZXggYzdjNzU2My4uYTMxMDYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAKQEAgLTEyNyw2ICsxMjcsOSBAQCBSZW5kZXJMYXllckJhY2tp bmc6On5SZW5kZXJMYXllckJhY2tpbmcoKQogICAgIHVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXll cnMoZmFsc2UsIGZhbHNlLCBmYWxzZSk7CiAgICAgdXBkYXRlRm9yZWdyb3VuZExheWVyKGZhbHNl KTsKICAgICB1cGRhdGVNYXNrTGF5ZXIoZmFsc2UpOworI2lmIE9TKEFORFJPSUQpCisgICAgdXBk YXRlU2Nyb2xsaW5nTGF5ZXJzKGZhbHNlKTsKKyNlbmRpZgogICAgIGRlc3Ryb3lHcmFwaGljc0xh eWVycygpOwogfQogCkBAIC0xODksNiArMTkyLDExIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5n OjpkZXN0cm95R3JhcGhpY3NMYXllcnMoKQogICAgIG1fZm9yZWdyb3VuZExheWVyID0gbnVsbHB0 cjsKICAgICBtX2NsaXBwaW5nTGF5ZXIgPSBudWxscHRyOwogICAgIG1fbWFza0xheWVyID0gbnVs bHB0cjsKKworI2lmIE9TKEFORFJPSUQpCisgICAgbV9zY3JvbGxpbmdMYXllciA9IG51bGxwdHI7 CisgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyID0gbnVsbHB0cjsKKyNlbmRpZgogfQogCiB2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlTGF5ZXJPcGFjaXR5KGNvbnN0IFJlbmRlclN0 eWxlKiBzdHlsZSkKQEAgLTIyNiw3ICsyMzQsMTEgQEAgc3RhdGljIGJvb2wgaGFzTm9uWmVyb1Ry YW5zZm9ybU9yaWdpbihjb25zdCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogc3RhdGljIGJvb2wg bGF5ZXJPckFuY2VzdG9ySXNUcmFuc2Zvcm1lZChSZW5kZXJMYXllciogbGF5ZXIpCiB7CiAgICAg Zm9yIChSZW5kZXJMYXllciogY3VyciA9IGxheWVyOyBjdXJyOyBjdXJyID0gY3Vyci0+cGFyZW50 KCkpIHsKLSAgICAgICAgaWYgKGN1cnItPmhhc1RyYW5zZm9ybSgpKQorICAgICAgICBpZiAoY3Vy ci0+aGFzVHJhbnNmb3JtKCkKKyNpZiBPUyhBTkRST0lEKQorICAgICAgICAgICAgfHwgY3Vyci0+ aGFzQWNjZWxlcmF0ZWRTY3JvbGxpbmcoKQorI2VuZGlmCisgICAgICAgICAgICApCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCkBAIC0zMjIsMTUgKzMzNCwyOSBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckNvbmZpZ3VyYXRpb24oKQog ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpOwogCiAgICAgYm9v bCBsYXllckNvbmZpZ0NoYW5nZWQgPSBmYWxzZTsKLSAgICBpZiAodXBkYXRlRm9yZWdyb3VuZExh eWVyKGNvbXBvc2l0b3ItPm5lZWRzQ29udGVudHNDb21wb3NpdGluZ0xheWVyKG1fb3duaW5nTGF5 ZXIpKSkKKyAgICBpZiAodXBkYXRlRm9yZWdyb3VuZExheWVyKGNvbXBvc2l0b3ItPm5lZWRzQ29u dGVudHNDb21wb3NpdGluZ0xheWVyKG1fb3duaW5nTGF5ZXIpCisjaWYgT1MoQU5EUk9JRCkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICYmICFtX293bmluZ0xheWVyLT5oYXNBY2NlbGVy YXRlZFNjcm9sbGluZygpCisjZW5kaWYKKyAgICAgICAgKSkKICAgICAgICAgbGF5ZXJDb25maWdD aGFuZ2VkID0gdHJ1ZTsKICAgICAKLSAgICBpZiAodXBkYXRlQ2xpcHBpbmdMYXllcnMoY29tcG9z aXRvci0+Y2xpcHBlZEJ5QW5jZXN0b3IobV9vd25pbmdMYXllciksIGNvbXBvc2l0b3ItPmNsaXBz Q29tcG9zaXRpbmdEZXNjZW5kYW50cyhtX293bmluZ0xheWVyKSkpCisgICAgYm9vbCBuZWVkc0Rl c2NlbmRlbnRzQ2xpcHBpbmdMYXllciA9IGNvbXBvc2l0b3ItPmNsaXBzQ29tcG9zaXRpbmdEZXNj ZW5kYW50cyhtX293bmluZ0xheWVyKTsKKyNpZiBPUyhBTkRST0lEKQorICAgIGlmIChtX293bmlu Z0xheWVyLT5oYXNBY2NlbGVyYXRlZFNjcm9sbGluZygpKQorICAgICAgICBuZWVkc0Rlc2NlbmRl bnRzQ2xpcHBpbmdMYXllciA9IGZhbHNlOworI2VuZGlmCisgICAgaWYgKHVwZGF0ZUNsaXBwaW5n TGF5ZXJzKGNvbXBvc2l0b3ItPmNsaXBwZWRCeUFuY2VzdG9yKG1fb3duaW5nTGF5ZXIpLCBuZWVk c0Rlc2NlbmRlbnRzQ2xpcHBpbmdMYXllcikpCiAgICAgICAgIGxheWVyQ29uZmlnQ2hhbmdlZCA9 IHRydWU7CiAKICAgICBpZiAodXBkYXRlT3ZlcmZsb3dDb250cm9sc0xheWVycyhyZXF1aXJlc0hv cml6b250YWxTY3JvbGxiYXJMYXllcigpLCByZXF1aXJlc1ZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIo KSwgcmVxdWlyZXNTY3JvbGxDb3JuZXJMYXllcigpKSkKICAgICAgICAgbGF5ZXJDb25maWdDaGFu Z2VkID0gdHJ1ZTsKIAorI2lmIE9TKEFORFJPSUQpCisgICAgaWYgKHVwZGF0ZVNjcm9sbGluZ0xh eWVycyhtX293bmluZ0xheWVyLT5oYXNBY2NlbGVyYXRlZFNjcm9sbGluZygpKSkKKyAgICAgICAg bGF5ZXJDb25maWdDaGFuZ2VkID0gdHJ1ZTsKKyNlbmRpZgorCiAgICAgaWYgKGxheWVyQ29uZmln Q2hhbmdlZCkKICAgICAgICAgdXBkYXRlSW50ZXJuYWxIaWVyYXJjaHkoKTsKIApAQCAtNDIzLDEx ICs0NDksMjAgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJH ZW9tZXRyeSgpCiAgICAgLy8gZGVzY2VuZGFudHMuIFNvLCB0aGUgdmlzaWJpbGl0eSBmbGFnIGZv ciBtX2dyYXBoaWNzTGF5ZXIgc2hvdWxkIGJlIHRydWUgaWYgdGhlcmUgYXJlIGFueQogICAgIC8v IG5vbi1jb21wb3NpdGluZyB2aXNpYmxlIGxheWVycy4KICAgICBtX2dyYXBoaWNzTGF5ZXItPnNl dENvbnRlbnRzVmlzaWJsZShtX293bmluZ0xheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhh c1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRMYXllcnMoKSk7Ci0KICAgICBSZW5kZXJT dHlsZSogc3R5bGUgPSByZW5kZXJlcigpLT5zdHlsZSgpOwogICAgIG1fZ3JhcGhpY3NMYXllci0+ c2V0UHJlc2VydmVzM0Qoc3R5bGUtPnRyYW5zZm9ybVN0eWxlM0QoKSA9PSBUcmFuc2Zvcm1TdHls ZTNEUHJlc2VydmUzRCAmJiAhcmVuZGVyZXIoKS0+aGFzUmVmbGVjdGlvbigpKTsKICAgICBtX2dy YXBoaWNzTGF5ZXItPnNldEJhY2tmYWNlVmlzaWJpbGl0eShzdHlsZS0+YmFja2ZhY2VWaXNpYmls aXR5KCkgPT0gQmFja2ZhY2VWaXNpYmlsaXR5VmlzaWJsZSk7CiAKKyNpZiBPUyhBTkRST0lEKQor ICAgIGlmIChzdHlsZS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uIHx8IGNvbXBvc2l0b3Io KS0+Zml4ZWRQb3NpdGlvbmVkQnlBbmNlc3RvcihtX293bmluZ0xheWVyKSkKKyAgICAgICAgY2hp bGRGb3JTdXBlcmxheWVycygpLT5zZXRGaXhlZFRvQ29udGFpbmVyTGF5ZXJWaXNpYmxlUmVjdCh0 cnVlKTsKKyAgICBlbHNlIHsKKyAgICAgICAgaWYgKG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyKQor ICAgICAgICAgICAgbV9hbmNlc3RvckNsaXBwaW5nTGF5ZXItPnNldEZpeGVkVG9Db250YWluZXJM YXllclZpc2libGVSZWN0KGZhbHNlKTsKKyAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRGaXhl ZFRvQ29udGFpbmVyTGF5ZXJWaXNpYmxlUmVjdChmYWxzZSk7CisgICAgfQorI2VuZGlmCisKICAg ICBSZW5kZXJMYXllciogY29tcEFuY2VzdG9yID0gbV9vd25pbmdMYXllci0+YW5jZXN0b3JDb21w b3NpdGluZ0xheWVyKCk7CiAgICAgCiAgICAgLy8gV2UgY29tcHV0ZSBldmVyeXRoaW5nIHJlbGF0 aXZlIHRvIHRoZSBlbmNsb3NpbmcgY29tcG9zaXRpbmcgbGF5ZXIuCkBAIC00NTQsMTIgKzQ4OSwy NSBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5 KCkKICAgICAgICAgZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9uID0gYW5jZXN0b3JDb21wb3Np dGluZ0JvdW5kcy5sb2NhdGlvbigpOwogICAgIGVsc2UKICAgICAgICAgZ3JhcGhpY3NMYXllclBh cmVudExvY2F0aW9uID0gcmVuZGVyZXIoKS0+dmlldygpLT5kb2N1bWVudFJlY3QoKS5sb2NhdGlv bigpOwotICAgIAorCisjaWYgT1MoQU5EUk9JRCkKKyAgICBpZiAoY29tcEFuY2VzdG9yICYmIGNv bXBBbmNlc3Rvci0+aGFzQWNjZWxlcmF0ZWRTY3JvbGxpbmcoKSkgeworICAgICAgICBSZW5kZXJC b3gqIHJlbmRlckJveCA9IHRvUmVuZGVyQm94KGNvbXBBbmNlc3Rvci0+cmVuZGVyZXIoKSk7Cisg ICAgICAgIExheW91dFNpemUgc2Nyb2xsT2Zmc2V0ID0gY29tcEFuY2VzdG9yLT5zY3JvbGxlZENv bnRlbnRPZmZzZXQoKTsKKyAgICAgICAgTGF5b3V0UG9pbnQgc2Nyb2xsT3JpZ2luKHJlbmRlckJv eC0+Ym9yZGVyTGVmdCgpLCByZW5kZXJCb3gtPmJvcmRlclRvcCgpKTsKKyAgICAgICAgZ3JhcGhp Y3NMYXllclBhcmVudExvY2F0aW9uID0gc2Nyb2xsT3JpZ2luIC0gc2Nyb2xsT2Zmc2V0OworICAg IH0KKyNlbmRpZgorCiAgICAgaWYgKGNvbXBBbmNlc3RvciAmJiBtX2FuY2VzdG9yQ2xpcHBpbmdM YXllcikgewogICAgICAgICAvLyBDYWxsIGNhbGN1bGF0ZVJlY3RzIHRvIGdldCB0aGUgYmFja2dy b3VuZFJlY3Qgd2hpY2ggaXMgd2hhdCBpcyB1c2VkIHRvIGNsaXAgdGhlIGNvbnRlbnRzIG9mIHRo aXMKICAgICAgICAgLy8gbGF5ZXIuIE5vdGUgdGhhdCB3ZSBjYWxsIGl0IHdpdGggdGVtcG9yYXJ5 Q2xpcFJlY3RzID0gdHJ1ZSBiZWNhdXNlIG5vcm1hbGx5IHdoZW4gY29tcHV0aW5nIGNsaXAgcmVj dHMKICAgICAgICAgLy8gZm9yIGEgY29tcG9zaXRpbmcgbGF5ZXIsIHJvb3RMYXllciBpcyB0aGUg bGF5ZXIgaXRzZWxmLgogICAgICAgICBJbnRSZWN0IHBhcmVudENsaXBSZWN0ID0gcGl4ZWxTbmFw cGVkSW50UmVjdChtX293bmluZ0xheWVyLT5iYWNrZ3JvdW5kQ2xpcFJlY3QoY29tcEFuY2VzdG9y LCAwLCB0cnVlKS5yZWN0KCkpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4K KyNpZiBPUyhBTkRST0lEKQorICAgICAgICBpZiAoY29tcEFuY2VzdG9yLT5oYXNBY2NlbGVyYXRl ZFNjcm9sbGluZygpKQorICAgICAgICAgICAgcGFyZW50Q2xpcFJlY3QgPSByZWxhdGl2ZUNvbXBv c2l0aW5nQm91bmRzOworI2VuZGlmCiAgICAgICAgIEFTU0VSVChwYXJlbnRDbGlwUmVjdCAhPSBQ YWludEluZm86OmluZmluaXRlUmVjdCgpKTsKICAgICAgICAgbV9hbmNlc3RvckNsaXBwaW5nTGF5 ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSArIChwYXJlbnRDbGlwUmVjdC5sb2NhdGlvbigp IC0gZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9uKSk7CiAgICAgICAgIG1fYW5jZXN0b3JDbGlw cGluZ0xheWVyLT5zZXRTaXplKHBhcmVudENsaXBSZWN0LnNpemUoKSk7CkBAIC00NzIsNyArNTIw LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRy eSgpCiAgICAgfQogCiAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50 KCkgKyAocmVsYXRpdmVDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXll clBhcmVudExvY2F0aW9uKSk7Ci0gICAgbV9ncmFwaGljc0xheWVyLT5zZXRPZmZzZXRGcm9tUmVu ZGVyZXIobG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpIC0gSW50UG9pbnQoKSk7Cisg ICAgbV9ncmFwaGljc0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIobG9jYWxDb21wb3NpdGlu Z0JvdW5kcy5sb2NhdGlvbigpIC0gTGF5b3V0UG9pbnQoKSk7CiAgICAgCiAgICAgRmxvYXRTaXpl IG9sZFNpemUgPSBtX2dyYXBoaWNzTGF5ZXItPnNpemUoKTsKICAgICBGbG9hdFNpemUgbmV3U2l6 ZSA9IHJlbGF0aXZlQ29tcG9zaXRpbmdCb3VuZHMuc2l6ZSgpOwpAQCAtNTYzLDYgKzYxMSwzMSBA QCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkK ICAgICAgICAgcmVmbGVjdGlvbkJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+c2V0UmVwbGljYXRl ZExheWVyUG9zaXRpb24oRmxvYXRQb2ludCgpICsgKGxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSBy ZWZsZWN0aW9uTGF5ZXJCb3VuZHMubG9jYXRpb24oKSkpOwogICAgIH0KIAorI2lmIE9TKEFORFJP SUQpCisgICAgaWYgKG1fc2Nyb2xsaW5nTGF5ZXIpIHsKKyAgICAgICAgQVNTRVJUKG1fc2Nyb2xs aW5nQ29udGVudHNMYXllcik7CisgICAgICAgIExheW91dFJlY3QgY2xpcHBpbmdCb3goY2xpcEJv eCh0b1JlbmRlckJveChyZW5kZXJlcigpKSkpOworICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5z ZXRTaXplKGNsaXBwaW5nQm94LnNpemUoKSk7CisgICAgICAgIC8vIFJlbmRlckxheWVyOjpsb2Nh bEJvdW5kaW5nQm94KCkgaXMgaW5mbGF0ZWQgd2l0aCB0aGlzIGZ1ZGdlIGZhY3Rvciwgc28gd2Ug bXVzdCBvZmZzZXQgdGhlIHNjcm9sbCBjbGlwcGluZyBsYXllciBieSBpdC4KKyAgICAgICAgaW50 IG91dGxpbmUgPSByZW5kZXJlcigpLT52aWV3KCktPm1heGltYWxPdXRsaW5lU2l6ZSgpOworICAg ICAgICBMYXlvdXRQb2ludCBjbGlwcGluZ09mZnNldChjbGlwcGluZ0JveC5sb2NhdGlvbigpICsg SW50UG9pbnQob3V0bGluZSwgb3V0bGluZSkpOworICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5z ZXRQb3NpdGlvbihGbG9hdFBvaW50KGNsaXBwaW5nT2Zmc2V0KSk7CisgICAgICAgIG1fc2Nyb2xs aW5nTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b1NpemUoY2xpcHBpbmdPZmZzZXQpKTsK KworICAgICAgICBMYXlvdXRTaXplIHNjcm9sbFNpemUobV9vd25pbmdMYXllci0+c2Nyb2xsV2lk dGgoKSwgbV9vd25pbmdMYXllci0+c2Nyb2xsSGVpZ2h0KCkpOworICAgICAgICBpZiAoc2Nyb2xs U2l6ZSAhPSBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNpemUoKSkKKyAgICAgICAgICAgIG1f c2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CisKKyAgICAgICAgTGF5 b3V0U2l6ZSBzY3JvbGxPZmZzZXQgPSBtX293bmluZ0xheWVyLT5zY3JvbGxlZENvbnRlbnRPZmZz ZXQoKTsKKyAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXRTaXplKHNjcm9sbFNp emUpOworICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0 UG9pbnQoLXNjcm9sbE9mZnNldC53aWR0aCgpLCAtc2Nyb2xsT2Zmc2V0LmhlaWdodCgpKSk7Cisg ICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKGNs aXBwaW5nQm94LmxvY2F0aW9uKCkgLSB0b1BvaW50KHNjcm9sbE9mZnNldCkpOworICAgICAgICBt X3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldEFjY2VsZXJhdGVzU2Nyb2xsaW5nKHRydWUpOwor CisgICAgICAgIGNvbXBvc2l0b3IoKS0+c2Nyb2xsaW5nTGF5ZXJBZGRlZE9yVXBkYXRlZChtX293 bmluZ0xheWVyKTsKKyAgICB9CisjZW5kaWYKKwogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29u dGVudHNSZWN0KGNvbnRlbnRzQm94KCkpOwogCiAgICAgLy8gSWYgdGhpcyBsYXllciB3YXMgY3Jl YXRlZCBqdXN0IGZvciBjbGlwcGluZyBvciB0byBhcHBseSBwZXJzcGVjdGl2ZSwgaXQgZG9lc24n dCBuZWVkIGl0cyBvd24gYmFja2luZyBzdG9yZS4KQEAgLTU3MCw2ICs2NDMsMTAgQEAgdm9pZCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAKICAgICB1 cGRhdGVEcmF3c0NvbnRlbnQoKTsKICAgICB1cGRhdGVBZnRlcldpZGdldFJlc2l6ZSgpOworCisj aWYgT1MoQU5EUk9JRCkKKyAgICBtX293bmluZ0xheWVyLT5zZXROZWVkc1VwZGF0ZU5vbkZhc3RT Y3JvbGxhYmxlUmVnaW9uKCk7CisjZW5kaWYKIH0KIAogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6 OnVwZGF0ZUludGVybmFsSGllcmFyY2h5KCkKQEAgLTc1Niw2ICs4MzMsNDggQEAgYm9vbCBSZW5k ZXJMYXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcihib29sIG5lZWRzTWFza0xheWVyKQogICAg IHJldHVybiBsYXllckNoYW5nZWQ7CiB9CiAKKyNpZiBPUyhBTkRST0lEKQorYm9vbCBSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZVNjcm9sbGluZ0xheWVycyhib29sIG5lZWRTY3JvbGxpbmdMYXll cnMpCit7CisgICAgYm9vbCBsYXllckNoYW5nZWQgPSBmYWxzZTsKKyAgICBpZiAobmVlZFNjcm9s bGluZ0xheWVycyAmJiAhbV9zY3JvbGxpbmdMYXllcikgeworICAgICAgICAvLyBPdXRlciBsYXll ciB3aGljaCBjb3JyZXNwb25kcyB3aXRoIHRoZSBzY3JvbGwgdmlldy4KKyAgICAgICAgbV9zY3Jv bGxpbmdMYXllciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZSh0aGlzKTsKKyNpZm5kZWYgTkRFQlVH CisgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldE5hbWUoIlNjcm9sbGluZyBjb250YWluZXIi KTsKKyNlbmRpZgorICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXREcmF3c0NvbnRlbnQoZmFs c2UpOworICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRNYXNrc1RvQm91bmRzKHRydWUpOwor CisgICAgICAgIC8vIElubmVyIGxheWVyIHdoaWNoIHJlbmRlcnMgdGhlIGNvbnRlbnQgdGhhdCBz Y3JvbGxzLgorICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXIgPSBHcmFwaGljc0xheWVy OjpjcmVhdGUodGhpcyk7CisjaWZuZGVmIE5ERUJVRworICAgICAgICBtX3Njcm9sbGluZ0NvbnRl bnRzTGF5ZXItPnNldE5hbWUoIlNjcm9sbGluZyBDb250ZW50cyIpOworI2VuZGlmCisgICAgICAg IG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOworICAgICAg ICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UoR3JhcGhpY3NMYXll clBhaW50Rm9yZWdyb3VuZCk7CisgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPmFkZENoaWxkKG1f c2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKSk7CisKKyAgICAgICAgbGF5ZXJDaGFuZ2VkID0g dHJ1ZTsKKyAgICAgICAgY29tcG9zaXRvcigpLT5zY3JvbGxpbmdMYXllckFkZGVkT3JVcGRhdGVk KG1fb3duaW5nTGF5ZXIpOworICAgIH0gZWxzZSBpZiAoIW5lZWRTY3JvbGxpbmdMYXllcnMgJiYg bV9zY3JvbGxpbmdMYXllcikgeworICAgICAgICBpZiAoIXJlbmRlcmVyKCktPmRvY3VtZW50QmVp bmdEZXN0cm95ZWQoKSkKKyAgICAgICAgICAgIGNvbXBvc2l0b3IoKS0+c2Nyb2xsaW5nTGF5ZXJS ZW1vdmVkKG1fb3duaW5nTGF5ZXIpOworCisgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXIgPSBudWxs cHRyOworICAgICAgICBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5ZXIgPSBudWxscHRyOworICAgICAg ICBsYXllckNoYW5nZWQgPSB0cnVlOworICAgIH0KKworICAgIGlmIChsYXllckNoYW5nZWQpIHsK KyAgICAgICAgdXBkYXRlSW50ZXJuYWxIaWVyYXJjaHkoKTsKKyAgICAgICAgbV9ncmFwaGljc0xh eWVyLT5zZXRQYWludGluZ1BoYXNlKHBhaW50aW5nUGhhc2VGb3JQcmltYXJ5TGF5ZXIoKSk7Cisg ICAgfQorCisgICAgcmV0dXJuIGxheWVyQ2hhbmdlZDsKK30KKyNlbmRpZgorCiBHcmFwaGljc0xh eWVyUGFpbnRpbmdQaGFzZSBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50aW5nUGhhc2VGb3JQcmlt YXJ5TGF5ZXIoKSBjb25zdAogewogICAgIHVuc2lnbmVkIHBoYXNlID0gR3JhcGhpY3NMYXllclBh aW50QmFja2dyb3VuZDsKQEAgLTc2NCw2ICs4ODMsMTEgQEAgR3JhcGhpY3NMYXllclBhaW50aW5n UGhhc2UgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludGluZ1BoYXNlRm9yUHJpbWFyeUxheWVyKCkg Y28KICAgICBpZiAoIW1fbWFza0xheWVyKQogICAgICAgICBwaGFzZSB8PSBHcmFwaGljc0xheWVy UGFpbnRNYXNrOwogCisjaWYgT1MoQU5EUk9JRCkKKyAgICBpZiAobV9zY3JvbGxpbmdDb250ZW50 c0xheWVyKQorICAgICAgICBwaGFzZSAmPSB+R3JhcGhpY3NMYXllclBhaW50Rm9yZWdyb3VuZDsK KyNlbmRpZgorCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXJQYWludGluZ1Bo YXNlPihwaGFzZSk7CiB9CiAKQEAgLTExMTUsNiArMTIzOSwxMSBAQCB2b2lkIFJlbmRlckxheWVy QmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheSgpCiAKICAgICBpZiAobV9tYXNrTGF5ZXIg JiYgbV9tYXNrTGF5ZXItPmRyYXdzQ29udGVudCgpKQogICAgICAgICBtX21hc2tMYXllci0+c2V0 TmVlZHNEaXNwbGF5KCk7CisKKyNpZiBPUyhBTkRST0lEKQorICAgIGlmIChtX3Njcm9sbGluZ0Nv bnRlbnRzTGF5ZXIgJiYgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5kcmF3c0NvbnRlbnQoKSkK KyAgICAgICAgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKKyNl bmRpZgogfQogCiAvLyByIGlzIGluIHRoZSBjb29yZGluYXRlIHNwYWNlIG9mIHRoZSBsYXllcidz IHJlbmRlciBvYmplY3QKQEAgLTExMzksNiArMTI2OCwxNCBAQCB2b2lkIFJlbmRlckxheWVyQmFj a2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheUluUmVjdChjb25zdCBJbnRSZWN0JiByKQogICAg ICAgICBsYXllckRpcnR5UmVjdC5tb3ZlKC1tX21hc2tMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVy KCkpOwogICAgICAgICBtX21hc2tMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KGxheWVyRGly dHlSZWN0KTsKICAgICB9CisKKyNpZiBPUyhBTkRST0lEKQorICAgIGlmIChtX3Njcm9sbGluZ0Nv bnRlbnRzTGF5ZXIgJiYgbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5kcmF3c0NvbnRlbnQoKSkg eworICAgICAgICBMYXlvdXRSZWN0IGxheWVyRGlydHlSZWN0ID0gcjsKKyAgICAgICAgbGF5ZXJE aXJ0eVJlY3QubW92ZSgtbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLT5vZmZzZXRGcm9tUmVuZGVy ZXIoKSk7CisgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0TmVlZHNEaXNwbGF5 SW5SZWN0KGxheWVyRGlydHlSZWN0KTsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBSZW5kZXJM YXllckJhY2tpbmc6OnBhaW50SW50b0xheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBo aWNzQ29udGV4dCogY29udGV4dCwKQEAgLTExODgsMTUgKzEzMjUsMjkgQEAgdm9pZCBSZW5kZXJM YXllckJhY2tpbmc6OnBhaW50Q29udGVudHMoY29uc3QgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NM YXllciwgR3JhcGgKICAgICBpZiAoUGFnZSogcGFnZSA9IHJlbmRlcmVyKCktPmZyYW1lKCktPnBh Z2UoKSkKICAgICAgICAgcGFnZS0+c2V0SXNQYWludGluZyh0cnVlKTsKICNlbmRpZgotICAgIGlm IChncmFwaGljc0xheWVyID09IG1fZ3JhcGhpY3NMYXllci5nZXQoKSB8fCBncmFwaGljc0xheWVy ID09IG1fZm9yZWdyb3VuZExheWVyLmdldCgpIHx8IGdyYXBoaWNzTGF5ZXIgPT0gbV9tYXNrTGF5 ZXIuZ2V0KCkpIHsKKyAgICBpZiAoZ3JhcGhpY3NMYXllciA9PSBtX2dyYXBoaWNzTGF5ZXIuZ2V0 KCkgfHwgZ3JhcGhpY3NMYXllciA9PSBtX2ZvcmVncm91bmRMYXllci5nZXQoKSB8fCBncmFwaGlj c0xheWVyID09IG1fbWFza0xheWVyLmdldCgpCisjaWYgT1MoQU5EUk9JRCkKKyAgICAgICB8fCBn cmFwaGljc0xheWVyID09IG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKQorI2VuZGlmCisg ICAgICAgICkgewogICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2ll ID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUGFpbnQobV9vd25pbmdMYXllci0+cmVu ZGVyZXIoKS0+ZnJhbWUoKSwgJmNvbnRleHQsIGNsaXApOwogCisjaWYgT1MoQU5EUk9JRCkKKyAg ICAgICAgTGF5b3V0UmVjdCBkaXJ0eVJlY3QgPSBjbGlwOworICAgICAgICBQYWludEJlaGF2aW9y IHBhaW50QmVoYXZpb3IgPSBQYWludEJlaGF2aW9yTm9ybWFsOworICAgICAgICBpZiAocGFpbnRp bmdQaGFzZSA9PSBHcmFwaGljc0xheWVyUGFpbnRGb3JlZ3JvdW5kICYmIGdyYXBoaWNzTGF5ZXIg PT0gbV9zY3JvbGxpbmdDb250ZW50c0xheWVyLmdldCgpKQorICAgICAgICAgICAgcGFpbnRCZWhh dmlvciB8PSBQYWludEJlaGF2aW9yRG9udENsaXBPdmVyZmxvdzsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgZGlydHlSZWN0LmludGVyc2VjdChjb21wb3NpdGVkQm91bmRzKCkpOworICAgICAg ICBwYWludEludG9MYXllcihtX293bmluZ0xheWVyLCAmY29udGV4dCwgZGlydHlSZWN0LCBwYWlu dEJlaGF2aW9yLCBwYWludGluZ1BoYXNlLCByZW5kZXJlcigpKTsKKyNlbHNlCiAgICAgICAgIC8v IFRoZSBkaXJ0eVJlY3QgaXMgaW4gdGhlIGNvb3JkcyBvZiB0aGUgcGFpbnRpbmcgcm9vdC4KICAg ICAgICAgSW50UmVjdCBkaXJ0eVJlY3QgPSBjb21wb3NpdGVkQm91bmRzKCk7CiAgICAgICAgIGRp cnR5UmVjdC5pbnRlcnNlY3QoY2xpcCk7CiAKICAgICAgICAgLy8gV2UgaGF2ZSB0byB1c2UgdGhl IHNhbWUgcm9vdCBhcyBmb3IgaGl0IHRlc3RpbmcsIGJlY2F1c2UgYm90aCBtZXRob2RzIGNhbiBj b21wdXRlIGFuZCBjYWNoZSBjbGlwUmVjdHMuCiAgICAgICAgIHBhaW50SW50b0xheWVyKG1fb3du aW5nTGF5ZXIsICZjb250ZXh0LCBkaXJ0eVJlY3QsIFBhaW50QmVoYXZpb3JOb3JtYWwsIHBhaW50 aW5nUGhhc2UsIHJlbmRlcmVyKCkpOworI2VuZGlmCiAKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRQYWludChjb29raWUpOwogICAgIH0gZWxzZSBpZiAoZ3JhcGhpY3NMYXll ciA9PSBsYXllckZvckhvcml6b250YWxTY3JvbGxiYXIoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IGE2YTAzYWMuLmFiZDExNTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTgz LDYgKzgzLDEyIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaGFzQ29udGVudHNMYXllcigpIGNvbnN0 IHsgcmV0dXJuIG1fZm9yZWdyb3VuZExheWVyICE9IDA7IH0KICAgICBHcmFwaGljc0xheWVyKiBm b3JlZ3JvdW5kTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX2ZvcmVncm91bmRMYXllci5nZXQoKTsg fQorCisjaWYgT1MoQU5EUk9JRCkKKyAgICBib29sIGhhc1Njcm9sbGluZ0xheWVyKCkgY29uc3Qg eyByZXR1cm4gbV9zY3JvbGxpbmdMYXllciAhPSAwOyB9CisgICAgR3JhcGhpY3NMYXllciogc2Ny b2xsaW5nTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGluZ0xheWVyLmdldCgpOyB9Cisg ICAgR3JhcGhpY3NMYXllciogc2Nyb2xsaW5nQ29udGVudHNMYXllcigpIGNvbnN0IHsgcmV0dXJu IG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKTsgfQorI2VuZGlmCiAgICAgCiAgICAgYm9v bCBoYXNNYXNrTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX21hc2tMYXllciAhPSAwOyB9CiAKQEAg LTE4MSw2ICsxODcsOSBAQCBwcml2YXRlOgogICAgIGJvb2wgcmVxdWlyZXNIb3Jpem9udGFsU2Ny b2xsYmFyTGF5ZXIoKSBjb25zdDsKICAgICBib29sIHJlcXVpcmVzVmVydGljYWxTY3JvbGxiYXJM YXllcigpIGNvbnN0OwogICAgIGJvb2wgcmVxdWlyZXNTY3JvbGxDb3JuZXJMYXllcigpIGNvbnN0 OworI2lmIE9TKEFORFJPSUQpCisgICAgYm9vbCB1cGRhdGVTY3JvbGxpbmdMYXllcnMoYm9vbCBu ZWVkU2Nyb2xsaW5nTGF5ZXJzKTsKKyNlbmRpZgogCiAgICAgR3JhcGhpY3NMYXllclBhaW50aW5n UGhhc2UgcGFpbnRpbmdQaGFzZUZvclByaW1hcnlMYXllcigpIGNvbnN0OwogICAgIApAQCAtMjM3 LDYgKzI0NiwxMSBAQCBwcml2YXRlOgogICAgIE93blB0cjxHcmFwaGljc0xheWVyPiBtX2xheWVy Rm9yVmVydGljYWxTY3JvbGxiYXI7CiAgICAgT3duUHRyPEdyYXBoaWNzTGF5ZXI+IG1fbGF5ZXJG b3JTY3JvbGxDb3JuZXI7CiAKKyNpZiBPUyhBTkRST0lEKQorICAgIE93blB0cjxHcmFwaGljc0xh eWVyPiBtX3Njcm9sbGluZ0xheWVyOyAgICAgICAgIC8vIG9ubHkgdXNlZCBpZiB0aGUgbGF5ZXIg aXMgc2Nyb2xsYWJsZS4KKyAgICBPd25QdHI8R3JhcGhpY3NMYXllcj4gbV9zY3JvbGxpbmdDb250 ZW50c0xheWVyOyAvLyBvbmx5IHVzZWQgaWYgdGhlIGxheWVyIGlzIHNjcm9sbGFibGUuCisjZW5k aWYKKwogICAgIEludFJlY3QgbV9jb21wb3NpdGVkQm91bmRzOwogCiAgICAgYm9vbCBtX2FydGlm aWNpYWxseUluZmxhdGVkQm91bmRzOyAgICAgIC8vIGJvdW5kcyBoYWQgdG8gYmUgbWFkZSBub24t emVybyB0byBtYWtlIHRyYW5zZm9ybS1vcmlnaW4gd29yawo=