81841 2012-03-21 15:52:50 -0700 [chromium] Fix scrollbar layers holding onto invalid textures after lost context 2012-03-22 09:09:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne cc-bugs enne jamesr nduca trchen webkit.review.bot oldest_to_newest 584724 0 enne 2012-03-21 15:52:50 -0700 LayerRendererChromium owns the render surface texture manager. CCScrollbarLayerImpl requests textures out of this texture manager. The texture manager pointer is stored in the managed texture on the layer. When the context is lost, the LRC gets recreated with a new RS texture manager. The CCScrollbarLayerImpl's managed texture is pointing at some bogus texture manager and can't reserve textures from it. Oops. See: http://code.google.com/p/chromium/issues/detail?id=119354 584784 1 133148 enne 2012-03-21 17:16:39 -0700 Created attachment 133148 Patch 584842 2 nduca 2012-03-21 18:02:14 -0700 W00t 584941 3 133148 jamesr 2012-03-21 20:53:06 -0700 Comment on attachment 133148 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133148&action=review > Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp:98 > + m_texture.clear(); This texture's managed by the LRC::m_renderSurfaceTextureManager, and we rebuild the LRC after a lost context so this texture should go bogus. Do we just need a setTextureManager() call before the reserve() in willDraw(), mayhaps? didLostContext should only be for non-managed resources. 584944 4 enne 2012-03-21 20:57:43 -0700 (In reply to comment #3) > (From update of attachment 133148 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133148&action=review > > > Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp:98 > > + m_texture.clear(); > > This texture's managed by the LRC::m_renderSurfaceTextureManager, and we rebuild the LRC after a lost context so this texture should go bogus. Do we just need a setTextureManager() call before the reserve() in willDraw(), mayhaps? > > didLostContext should only be for non-managed resources. Ok, sure. It's the same difference from the scrollbar layer's perspective. Clearing the texture seemed slightly cleaner since there won't ever be an invalid texture manager, but I guess CCVideoLayerImpl does what you say above already. I can do that. 584949 5 133181 enne 2012-03-21 21:10:27 -0700 Created attachment 133181 Use setTextureManager 584950 6 133181 jamesr 2012-03-21 21:21:24 -0700 Comment on attachment 133181 Use setTextureManager Thanks. This isn't really much different, but I have wild dreams sometimes of making this a bit more automagic so you don't have to explicitly do this hookup before using the texture - maybe by having the reserve call be on some object that can take care of these details. 585037 7 133181 nduca 2012-03-22 00:48:38 -0700 Comment on attachment 133181 Use setTextureManager Gonna put this on cq so folks evaluating impl thread tomorrow can get this in their morning builds. 585038 8 133181 webkit.review.bot 2012-03-22 00:50:37 -0700 Comment on attachment 133181 Use setTextureManager Rejecting attachment 133181 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: patching file Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp patching file Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp Hunk #1 FAILED at 25. Hunk #2 succeeded at 981 (offset -103 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'James Robi..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12070863 585086 9 nduca 2012-03-22 02:43:33 -0700 Whommmmp 585315 10 133181 danakj 2012-03-22 08:22:35 -0700 Comment on attachment 133181 Use setTextureManager View in context: https://bugs.webkit.org/attachment.cgi?id=133181&action=review > Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp:28 > +#include "cc/CCQuadCuller.h" was this on purpose? 585329 11 133181 webkit.review.bot 2012-03-22 08:37:51 -0700 Comment on attachment 133181 Use setTextureManager Clearing flags on attachment: 133181 Committed r111708: <http://trac.webkit.org/changeset/111708> 585330 12 webkit.review.bot 2012-03-22 08:37:56 -0700 All reviewed patches have been landed. Closing bug. 585355 13 enne 2012-03-22 09:09:53 -0700 (In reply to comment #10) > (From update of attachment 133181 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133181&action=review > > > Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp:28 > > +#include "cc/CCQuadCuller.h" > > was this on purpose? Oops, I had originally done this test without a CCLTHI, so that's just vestigial. Thanks for landing this. 133148 2012-03-21 17:16:39 -0700 2012-03-21 21:10:25 -0700 Patch bug-81841-20120321171637.patch text/plain 5039 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2IxN2U4ZjMzMWJkNDI4 ZGRmZjE5ZjUxM2ZkOTEyMzQ3NDI1ZGEwYy4uMDJlZDQ5OTRjZWZhM2JiYTFkZTkyNDM4ZDBjOGRl MWIxMjZiZGYyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTIxICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBGaXgg c2Nyb2xsYmFyIGxheWVycyBob2xkaW5nIG9udG8gaW52YWxpZCB0ZXh0dXJlcyBhZnRlciBsb3N0 IGNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgxODQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VW5pdCB0ZXN0OiBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5zY3JvbGxiYXJMYXllckxvc3RDb250 ZXh0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJh ckxheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1Njcm9sbGJhckxheWVySW1wbDo6 ZGlkTG9zZUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuaDoKKyAgICAgICAgKEND U2Nyb2xsYmFyTGF5ZXJJbXBsKToKKwogMjAxMi0wMy0yMSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtq QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEVhcmx5IG91dCBpbiBhIG5ldyBw cmVwYXJlVG9EcmF3KCkgc3RlcCBpZiBjaGVja2VyYm9hcmRpbmcgYW4gYWNjZWxlcmF0ZWQgYW5p bWF0aW9uIGluIG9yZGVyIHRvIHNraXAgdGhlIGZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CmluZGV4IDhjYjRlYmM0OGNjNDk2NTMyNTU5Yjg5OTMyOWRjOTdlN2I0MWY1ZDcuLjU3YmE4ZDM4 MDJhOTVlYTJkZmEzYWMwNDIzNGYyZWYxOTE5YzY3YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDMtMjEgIEFkcmllbm5lIFdhbGtlciAgPGVubmVA Z29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBzY3JvbGxiYXIgbGF5ZXJzIGhv bGRpbmcgb250byBpbnZhbGlkIHRleHR1cmVzIGFmdGVyIGxvc3QgY29udGV4dAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE4NDEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVl SG9zdEltcGxUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUX0YpOgorICAgICAg ICAoV2ViS2l0VGVzdHMpOgorCiAyMDEyLTAzLTIxICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRWFybHkgb3V0IGluIGEgbmV3IHByZXBh cmVUb0RyYXcoKSBzdGVwIGlmIGNoZWNrZXJib2FyZGluZyBhbiBhY2NlbGVyYXRlZCBhbmltYXRp b24gaW4gb3JkZXIgdG8gc2tpcCB0aGUgZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFy TGF5ZXJJbXBsLmNwcAppbmRleCAxNTIwNjVkMDhlMTExZDlhZTFjZGI1ZmQ2MzMxZTgxOTQwMTBj NWRhLi43MjFiYzkzMmZhMGU5MDFkNmUyYzBlZGZjZTMwNGE0NzE4YzFhZWQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJh ckxheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuY3BwCkBAIC05Myw2ICs5MywxMSBAQCB2b2lk IENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpkaWREcmF3KCkKICAgICBtX3RleHR1cmUtPnVucmVzZXJ2 ZSgpOwogfQogCit2b2lkIENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpkaWRMb3NlQ29udGV4dCgpCit7 CisgICAgbV90ZXh0dXJlLmNsZWFyKCk7Cit9CisKIHZvaWQgQ0NTY3JvbGxiYXJMYXllckltcGw6 OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCkKIHsKICAgICBTY3JvbGxiYXJUaGVtZSog dGhlbWUgPSBTY3JvbGxiYXJUaGVtZTo6dGhlbWUoKTsgLy8gRklYTUU6IHNob3VsZCBtYWtlIGlt cGwtc2lkZSBjbG9uZSBpZiBuZWVkZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBsLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJhckxheWVySW1w bC5oCmluZGV4IGIwM2U0NTFlYjM5MjM1MDFjMmU2NTM5ZmRjYWM2ZjQ3ODVhOWM3ODYuLjA5OTJj ZTlkMDRjMjEyZDZkMDZkMTZkOTc0YmRiZWU0ODk3ZmIyNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBs LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NT Y3JvbGxiYXJMYXllckltcGwuaApAQCAtNjMsNiArNjMsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIGFwcGVuZFF1YWRzKENDUXVhZEN1bGxlciYsIGNvbnN0IENDU2hhcmVkUXVhZFN0YXRl KiwgYm9vbCYgdXNlZENoZWNrZXJib2FyZCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZERyYXcoKTsK IAorICAgIHZpcnR1YWwgdm9pZCBkaWRMb3NlQ29udGV4dCgpOworCiBwcm90ZWN0ZWQ6CiAgICAg ZXhwbGljaXQgQ0NTY3JvbGxiYXJMYXllckltcGwoaW50IGlkKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcApp bmRleCA0NGRjZDE0MjQyZjUzMTBmYWNmZmZmNzRhNzhhYzdjMmUzY2VhOGFiLi5hNTdiNWIzNzk1 ZTRjYzczNzE5MmQ5MmQwMmQzYWY5YTU5YjQ5ODMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcApAQCAtMjUs MTIgKzI1LDE0IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNpbmNsdWRlICJjYy9DQ0xheWVy VHJlZUhvc3RJbXBsLmgiCisjaW5jbHVkZSAiY2MvQ0NRdWFkQ3VsbGVyLmgiCiAKICNpbmNsdWRl ICJDQ0FuaW1hdGlvblRlc3RDb21tb24uaCIKICNpbmNsdWRlICJGYWtlV2ViR3JhcGhpY3NDb250 ZXh0M0QuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaCIKICNpbmNsdWRl ICJMYXllclJlbmRlcmVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJjYy9DQ0xheWVySW1wbC5oIgor I2luY2x1ZGUgImNjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBsLmgiCiAjaW5jbHVkZSAiY2MvQ0NTaW5n bGVUaHJlYWRQcm94eS5oIgogI2luY2x1ZGUgImNjL0NDVGlsZURyYXdRdWFkLmgiCiAjaW5jbHVk ZSA8Z3Rlc3QvZ3Rlc3QuaD4KQEAgLTEwODQsNCArMTA4NiwyNyBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0SW1wbFRlc3QsIGZpbmlzaEFsbFJlbmRlcmluZ0FmdGVyQ29udGV4dExvc3QpCiAgICAg bV9ob3N0SW1wbC0+ZmluaXNoQWxsUmVuZGVyaW5nKCk7CiB9CiAKK1RFU1RfRihDQ0xheWVyVHJl ZUhvc3RJbXBsVGVzdCwgc2Nyb2xsYmFyTGF5ZXJMb3N0Q29udGV4dCkKK3sKKyAgICBtX2hvc3RJ bXBsLT5pbml0aWFsaXplTGF5ZXJSZW5kZXJlcihjcmVhdGVDb250ZXh0KCkpOworICAgIG1faG9z dEltcGwtPnNldFZpZXdwb3J0U2l6ZShJbnRTaXplKDEwLCAxMCkpOworCisgICAgbV9ob3N0SW1w bC0+c2V0Um9vdExheWVyKENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpjcmVhdGUoMCkpOworICAgIEND U2Nyb2xsYmFyTGF5ZXJJbXBsKiBzY3JvbGxiYXIgPSBzdGF0aWNfY2FzdDxDQ1Njcm9sbGJhckxh eWVySW1wbCo+KG1faG9zdEltcGwtPnJvb3RMYXllcigpKTsKKyAgICBzY3JvbGxiYXItPnNldEJv dW5kcyhJbnRTaXplKDEsIDEpKTsKKyAgICBzY3JvbGxiYXItPnNldENvbnRlbnRCb3VuZHMoSW50 U2l6ZSgxLCAxKSk7CisgICAgc2Nyb2xsYmFyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisKKyAg ICBmb3IgKGludCBpID0gMDsgaSA8IDI7ICsraSkgeworICAgICAgICBDQ0xheWVyVHJlZUhvc3RJ bXBsOjpGcmFtZURhdGEgZnJhbWU7CisgICAgICAgIEVYUEVDVF9UUlVFKG1faG9zdEltcGwtPnBy ZXBhcmVUb0RyYXcoZnJhbWUpKTsKKyAgICAgICAgQVNTRVJUKGZyYW1lLnJlbmRlclBhc3Nlcy5z aXplKCkgPT0gMSk7CisgICAgICAgIENDUmVuZGVyUGFzcyogcmVuZGVyUGFzcyA9IGZyYW1lLnJl bmRlclBhc3Nlc1swXS5nZXQoKTsKKyAgICAgICAgLy8gU2Nyb2xsYmFyIGxheWVyIHNob3VsZCBh bHdheXMgZ2VuZXJhdGUgcXVhZHMsIGV2ZW4gYWZ0ZXIgbG9zdCBjb250ZXh0CisgICAgICAgIEVY UEVDVF9HVChyZW5kZXJQYXNzLT5xdWFkTGlzdCgpLnNpemUoKSwgMHUpOworCisgICAgICAgIG1f aG9zdEltcGwtPmluaXRpYWxpemVMYXllclJlbmRlcmVyKGNyZWF0ZUNvbnRleHQoKSk7CisgICAg fQorfQorCiB9IC8vIG5hbWVzcGFjZQo= 133181 2012-03-21 21:10:27 -0700 2012-03-22 08:37:51 -0700 Use setTextureManager bug-81841-20120321211026.patch text/plain 4480 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2IxN2U4ZjMzMWJkNDI4 ZGRmZjE5ZjUxM2ZkOTEyMzQ3NDI1ZGEwYy4uZDg2ZmE5ZTA0YWNhM2VhZmYwOTQzMTU0ZTBhZjY5 YjQ2MjczMzAxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTIxICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBGaXgg c2Nyb2xsYmFyIGxheWVycyBob2xkaW5nIG9udG8gaW52YWxpZCB0ZXh0dXJlcyBhZnRlciBsb3N0 IGNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgxODQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VW5pdCB0ZXN0OiBDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5zY3JvbGxiYXJMYXllckxvc3RDb250 ZXh0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJh ckxheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1Njcm9sbGJhckxheWVySW1wbDo6 d2lsbERyYXcpOgorCiAyMDEyLTAzLTIxICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRWFybHkgb3V0IGluIGEgbmV3IHByZXBhcmVUb0Ry YXcoKSBzdGVwIGlmIGNoZWNrZXJib2FyZGluZyBhbiBhY2NlbGVyYXRlZCBhbmltYXRpb24gaW4g b3JkZXIgdG8gc2tpcCB0aGUgZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOGNi NGViYzQ4Y2M0OTY1MzI1NTliODk5MzI5ZGM5N2U3YjQxZjVkNy4uNTdiYThkMzgwMmE5NWVhMmRm YTNhYzA0MjM0ZjJlZjE5MTljNjdjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMi0wMy0yMSAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29t PgorCisgICAgICAgIFtjaHJvbWl1bV0gRml4IHNjcm9sbGJhciBsYXllcnMgaG9sZGluZyBvbnRv IGludmFsaWQgdGV4dHVyZXMgYWZ0ZXIgbG9zdCBjb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTg0MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRl c3QuY3BwOgorICAgICAgICAoV2ViS2l0VGVzdHM6OlRFU1RfRik6CisgICAgICAgIChXZWJLaXRU ZXN0cyk6CisKIDIwMTItMDMtMjEgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgW2Nocm9taXVtXSBFYXJseSBvdXQgaW4gYSBuZXcgcHJlcGFyZVRvRHJhdygp IHN0ZXAgaWYgY2hlY2tlcmJvYXJkaW5nIGFuIGFjY2VsZXJhdGVkIGFuaW1hdGlvbiBpbiBvcmRl ciB0byBza2lwIHRoZSBmcmFtZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwu Y3BwCmluZGV4IDE1MjA2NWQwOGUxMTFkOWFlMWNkYjVmZDYzMzFlODE5NDAxMGM1ZGEuLjRmZmM0 YWQxZDA4OGE2MzA1YTg3ZTNiMjQ5N2JkMjZjNDMwMjk1YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q1Njcm9sbGJhckxheWVySW1wbC5jcHAKQEAgLTU4LDYgKzU4LDEwIEBAIHZvaWQgQ0NTY3JvbGxi YXJMYXllckltcGw6OndpbGxEcmF3KExheWVyUmVuZGVyZXJDaHJvbWl1bSogbGF5ZXJSZW5kZXJl cikKICAgICBpZiAoIW1fdGV4dHVyZSkKICAgICAgICAgbV90ZXh0dXJlID0gTWFuYWdlZFRleHR1 cmU6OmNyZWF0ZShsYXllclJlbmRlcmVyLT5yZW5kZXJTdXJmYWNlVGV4dHVyZU1hbmFnZXIoKSk7 CiAKKyAgICAvLyBUaGUgY29udGV4dCBjb3VsZCBoYXZlIGJlZW4gbG9zdCBzaW5jZSB0aGUgbGFz dCBmcmFtZSBhbmQgdGhlIG9sZCB0ZXh0dXJlCisgICAgLy8gbWFuYWdlciBtYXkgbm8gbG9uZ2Vy IGJlIHZhbGlkLgorICAgIG1fdGV4dHVyZS0+c2V0VGV4dHVyZU1hbmFnZXIobGF5ZXJSZW5kZXJl ci0+cmVuZGVyU3VyZmFjZVRleHR1cmVNYW5hZ2VyKCkpOworCiAgICAgSW50U2l6ZSB0ZXh0dXJl U2l6ZSA9IGNvbnRlbnRCb3VuZHMoKTsKICAgICBpZiAoIW1fdGV4dHVyZS0+cmVzZXJ2ZSh0ZXh0 dXJlU2l6ZSwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEpKQogICAgICAgICByZXR1cm47CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxU ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1w bFRlc3QuY3BwCmluZGV4IDQ0ZGNkMTQyNDJmNTMxMGZhY2ZmZmY3NGE3OGFjN2MyZTNjZWE4YWIu LmE1N2I1YjM3OTVlNGNjNzM3MTkyZDkyZDAyZDNhZjlhNTliNDk4MzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qu Y3BwCkBAIC0yNSwxMiArMjUsMTQgQEAKICNpbmNsdWRlICJjb25maWcuaCIKIAogI2luY2x1ZGUg ImNjL0NDTGF5ZXJUcmVlSG9zdEltcGwuaCIKKyNpbmNsdWRlICJjYy9DQ1F1YWRDdWxsZXIuaCIK IAogI2luY2x1ZGUgIkNDQW5pbWF0aW9uVGVzdENvbW1vbi5oIgogI2luY2x1ZGUgIkZha2VXZWJH cmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5o IgogI2luY2x1ZGUgIkxheWVyUmVuZGVyZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgImNjL0NDTGF5 ZXJJbXBsLmgiCisjaW5jbHVkZSAiY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuaCIKICNpbmNsdWRl ICJjYy9DQ1NpbmdsZVRocmVhZFByb3h5LmgiCiAjaW5jbHVkZSAiY2MvQ0NUaWxlRHJhd1F1YWQu aCIKICNpbmNsdWRlIDxndGVzdC9ndGVzdC5oPgpAQCAtMTA4NCw0ICsxMDg2LDI3IEBAIFRFU1Rf RihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgZmluaXNoQWxsUmVuZGVyaW5nQWZ0ZXJDb250ZXh0 TG9zdCkKICAgICBtX2hvc3RJbXBsLT5maW5pc2hBbGxSZW5kZXJpbmcoKTsKIH0KIAorVEVTVF9G KENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzY3JvbGxiYXJMYXllckxvc3RDb250ZXh0KQorewor ICAgIG1faG9zdEltcGwtPmluaXRpYWxpemVMYXllclJlbmRlcmVyKGNyZWF0ZUNvbnRleHQoKSk7 CisgICAgbV9ob3N0SW1wbC0+c2V0Vmlld3BvcnRTaXplKEludFNpemUoMTAsIDEwKSk7CisKKyAg ICBtX2hvc3RJbXBsLT5zZXRSb290TGF5ZXIoQ0NTY3JvbGxiYXJMYXllckltcGw6OmNyZWF0ZSgw KSk7CisgICAgQ0NTY3JvbGxiYXJMYXllckltcGwqIHNjcm9sbGJhciA9IHN0YXRpY19jYXN0PEND U2Nyb2xsYmFyTGF5ZXJJbXBsKj4obV9ob3N0SW1wbC0+cm9vdExheWVyKCkpOworICAgIHNjcm9s bGJhci0+c2V0Qm91bmRzKEludFNpemUoMSwgMSkpOworICAgIHNjcm9sbGJhci0+c2V0Q29udGVu dEJvdW5kcyhJbnRTaXplKDEsIDEpKTsKKyAgICBzY3JvbGxiYXItPnNldERyYXdzQ29udGVudCh0 cnVlKTsKKworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgMjsgKytpKSB7CisgICAgICAgIENDTGF5 ZXJUcmVlSG9zdEltcGw6OkZyYW1lRGF0YSBmcmFtZTsKKyAgICAgICAgRVhQRUNUX1RSVUUobV9o b3N0SW1wbC0+cHJlcGFyZVRvRHJhdyhmcmFtZSkpOworICAgICAgICBBU1NFUlQoZnJhbWUucmVu ZGVyUGFzc2VzLnNpemUoKSA9PSAxKTsKKyAgICAgICAgQ0NSZW5kZXJQYXNzKiByZW5kZXJQYXNz ID0gZnJhbWUucmVuZGVyUGFzc2VzWzBdLmdldCgpOworICAgICAgICAvLyBTY3JvbGxiYXIgbGF5 ZXIgc2hvdWxkIGFsd2F5cyBnZW5lcmF0ZSBxdWFkcywgZXZlbiBhZnRlciBsb3N0IGNvbnRleHQK KyAgICAgICAgRVhQRUNUX0dUKHJlbmRlclBhc3MtPnF1YWRMaXN0KCkuc2l6ZSgpLCAwdSk7CisK KyAgICAgICAgbV9ob3N0SW1wbC0+aW5pdGlhbGl6ZUxheWVyUmVuZGVyZXIoY3JlYXRlQ29udGV4 dCgpKTsKKyAgICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlCg==