208876 2020-03-10 12:40:12 -0700 [GPU Process] RemoteImageBufferProxy should ensure the state stack of the context is cleared before destruction 2020-09-29 16:39:16 -0700 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sabouhallawa sabouhallawa dino mmaxfield simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1628360 0 sabouhallawa 2020-03-10 12:40:12 -0700 For any reason, if the GraphicsContext::save() did not get a matching GraphicsContext::restore(), the destructor of GraphicsContext will assert: the state stack is not empty. In some cases, the GPU Process may terminate before receiving the matching restore() for the RemoteImageBufferProxy. This can depend on when CanvasRenderingContext2D.save() and its matching restore() are called. This causes many failures in the canvas layout tests. Currently running 'run-webkit-tests --debug --no-retry LayoutTests/canvas/ LayoutTests/fast/canvas --internal-feature RenderCanvasInGPUProcessEnabled' results 255 failures. 1628361 1 393173 sabouhallawa 2020-03-10 12:47:10 -0700 Created attachment 393173 Patch 1628362 2 sabouhallawa 2020-03-10 12:48:27 -0700 This patch lowers the number of failures in the above command from 255 to 100 failures. 1628889 3 393173 mmaxfield 2020-03-11 15:54:48 -0700 Comment on attachment 393173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393173&action=review > Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h:58 > + // destruction, to avoid assertions in the GraphicsContext dtor. Does it make sense to delete the assertion instead? The purpose of assertions is to find bugs, not to force us to do busywork. 1629014 4 393173 sabouhallawa 2020-03-11 20:32:58 -0700 Comment on attachment 393173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393173&action=review >> Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h:58 >> + // destruction, to avoid assertions in the GraphicsContext dtor. > > Does it make sense to delete the assertion instead? The purpose of assertions is to find bugs, not to force us to do busywork. I think the assertion is important to have. I hit this assertion only when running layout tests. When reloading the same page or load different pages, I see we are doing the right thing: the restore commands are pushed from the WebProcess to the GPUProcess and the loop below, does not execute even once. This is the same we do in CanvasRenderingContext2DBase::unwindStateStack(). I can do the same thing that other function is doing: #if ASSERT_ENABLED while (context().stackSize()) context().restore(); #endif 1629019 5 393173 simon.fraser 2020-03-11 20:42:04 -0700 Comment on attachment 393173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393173&action=review >>> Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h:58 >>> + // destruction, to avoid assertions in the GraphicsContext dtor. >> >> Does it make sense to delete the assertion instead? The purpose of assertions is to find bugs, not to force us to do busywork. > > I think the assertion is important to have. I hit this assertion only when running layout tests. When reloading the same page or load different pages, I see we are doing the right thing: the restore commands are pushed from the WebProcess to the GPUProcess and the loop below, does not execute even once. This is the same we do in CanvasRenderingContext2DBase::unwindStateStack(). > > I can do the same thing that other function is doing: > > #if ASSERT_ENABLED > while (context().stackSize()) > context().restore(); > #endif I don't think we should have different behavior in debug builds vs. release. Either always clear the stack, or remove the assertion. 1629250 6 393389 sabouhallawa 2020-03-12 10:54:21 -0700 Created attachment 393389 Patch 1629254 7 393389 simon.fraser 2020-03-12 10:57:38 -0700 Comment on attachment 393389 Patch We should not have different behavior in debug. 1629268 8 393173 sabouhallawa 2020-03-12 11:09:57 -0700 Comment on attachment 393173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393173&action=review >>>> Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h:58 >>>> + // destruction, to avoid assertions in the GraphicsContext dtor. >>> >>> Does it make sense to delete the assertion instead? The purpose of assertions is to find bugs, not to force us to do busywork. >> >> I think the assertion is important to have. I hit this assertion only when running layout tests. When reloading the same page or load different pages, I see we are doing the right thing: the restore commands are pushed from the WebProcess to the GPUProcess and the loop below, does not execute even once. This is the same we do in CanvasRenderingContext2DBase::unwindStateStack(). >> >> I can do the same thing that other function is doing: >> >> #if ASSERT_ENABLED >> while (context().stackSize()) >> context().restore(); >> #endif > > I don't think we should have different behavior in debug builds vs. release. Either always clear the stack, or remove the assertion. -- I think the assertion is very useful for the render tree rendering where we control the save/restore. This assertion will detect if we miss a restore. -- In CanvasRenderingContext2DBase, the save and restore are controlled by the javascript. If the javascript missed a restore, the assertion should not fire. -- In RemoteImageBufferProxy, the restore might be lost because the connection between the GPUProcess and the WebProcess is terminated. In this case the assertion should not fire. In the three cases the code to unwind the state stack and check the state stack is empty is only under #if ASSERT_ENABLED. If this is not the right approach, I think we can do one of the following: 1. Remove the assertion and CanvasRenderingContext2DBase::unwindStateStack() also. 2. Add a flag to GraphicsContext like m_externalSaveRestoreControl. It will be true for the ImageBuffer context of CanvasRenderingContext2DBase and for the graphics context of RemoteImageBufferProxy. In the destructor of GraphicsContext. We can assert ASSERT_IMPLIES(!m_externalSaveRestoreControl, m_stack.isEmpty()); 1693168 9 410054 wenson_hsieh 2020-09-29 14:46:26 -0700 Created attachment 410054 Reupload Said’s patch 1693216 10 410054 thorton 2020-09-29 16:31:50 -0700 Comment on attachment 410054 Reupload Said’s patch As I said on Slack... "seems a little funky, but OK". 1693223 11 ews-feeder 2020-09-29 16:38:23 -0700 Committed r267772: <https://trac.webkit.org/changeset/267772> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410054. 1693224 12 webkit-bug-importer 2020-09-29 16:39:16 -0700 <rdar://problem/69769208> 393173 2020-03-10 12:47:10 -0700 2020-03-12 10:54:20 -0700 Patch bug-208876-20200310124709.patch text/plain 2456 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc4M2EwYTBmOWI5ZWZhZTZl NzM4MGMzMTc0YjVjOThmZDM2MTlhOTMuLjNlYzUwNGJkYWE1ZWMwNDk5YjcxZjU5ODgzOGU2Yzhl MGE1ZjM0Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDMtMTAgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nl c3NdIFJlbW90ZUltYWdlQnVmZmVyUHJveHkgc2hvdWxkIGVuc3VyZSB0aGUgc3RhdGUgc3RhY2sg aW4gdGhlIGNvbnRleHQgaXMgY2xlYXJlZCBiZWZvcmUgZGVzdHJ1Y3Rpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODg3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSBzdGF0 ZSBzdGFjayBpbiB0aGUgY29udGV4dCBvZiBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5IGlzCisgICAg ICAgIGNsZWFyZWQgYmVmb3JlIGRlc3RydWN0aW9uLgorCisgICAgICAgIFRoZSBjb25uZWN0aW9u IGJldHdlZW4gR1BVUHJvY2VzcyBhbmQgV2ViUHJvY2VzcyBtYXkgaGF2ZSBiZWVuIHRlcm1pbmF0 ZWQKKyAgICAgICAgYmVmb3JlIGEgc2F2ZSgpIHJlY2VpdmVzIGl0cyBtYXRjaGluZyByZXN0b3Jl LgorCisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5 Lmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUltYWdlQnVmZmVyUHJveHk6On5SZW1vdGVJbWFn ZUJ1ZmZlclByb3h5KToKKwogMjAyMC0wMy0xMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgRG8gbm90IGNyZWF0ZSBhIHNlcnZpY2Ugd29ya2VyIGNvbm5lY3Rp b24gaWYgc2VydmljZSB3b3JrZXIgaXMgbm90IGVuYWJsZWQgaW4gbmV0d29yayBwcm9jZXNzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VC dWZmZXJQcm94eS5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUlt YWdlQnVmZmVyUHJveHkuaAppbmRleCA2Yzk2Y2ViOGFlMDU1NmVmZDBhYThjMDQyMDI3OGEzMWRj ZjM5OTNmLi5lZDcyMDAzNjY5ZTA4NTYzNjE3YmQwMjQ3OWJjY2QwNGM2YjkxYTZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQ cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVJbWFn ZUJ1ZmZlclByb3h5LmgKQEAgLTM2LDYgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiB0ZW1w bGF0ZTx0eXBlbmFtZSBCYWNrZW5kVHlwZT4KIGNsYXNzIFJlbW90ZUltYWdlQnVmZmVyUHJveHkg OiBwdWJsaWMgV2ViQ29yZTo6Q29uY3JldGVJbWFnZUJ1ZmZlcjxCYWNrZW5kVHlwZT4sIHB1Ymxp YyBSZW1vdGVJbWFnZUJ1ZmZlck1lc3NhZ2VIYW5kbGVyUHJveHksIHB1YmxpYyBEaXNwbGF5TGlz dDo6UmVwbGF5ZXI6OkRlbGVnYXRlIHsKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZl ciA9IFdlYkNvcmU6OkNvbmNyZXRlSW1hZ2VCdWZmZXI8QmFja2VuZFR5cGU+OworICAgIHVzaW5n IEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyOjpjb250ZXh0OwogICAgIHVzaW5nIEJhc2VDb25jcmV0 ZUltYWdlQnVmZmVyOjptX2JhY2tlbmQ7CiAKIHB1YmxpYzoKQEAgLTUxLDYgKzUyLDE0IEBAIHB1 YmxpYzoKICAgICAgICAgY3JlYXRlQmFja2VuZChtX2JhY2tlbmQtPmxvZ2ljYWxTaXplKCksIG1f YmFja2VuZC0+YmFja2VuZFNpemUoKSwgbV9iYWNrZW5kLT5yZXNvbHV0aW9uU2NhbGUoKSwgbV9i YWNrZW5kLT5jb2xvclNwYWNlKCksIG1fYmFja2VuZC0+Y3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5k SGFuZGxlKCkpOwogICAgIH0KIAorICAgIH5SZW1vdGVJbWFnZUJ1ZmZlclByb3h5KCkKKyAgICB7 CisgICAgICAgIC8vIEVuc3VyZSB0aGF0IHRoZSBzdGF0ZSBzdGFjayBpbiB0aGUgY29udGV4dCBp cyBjbGVhcmVkIGJlZm9yZQorICAgICAgICAvLyBkZXN0cnVjdGlvbiwgdG8gYXZvaWQgYXNzZXJ0 aW9ucyBpbiB0aGUgR3JhcGhpY3NDb250ZXh0IGR0b3IuCisgICAgICAgIHdoaWxlIChjb250ZXh0 KCkuc3RhY2tTaXplKCkpCisgICAgICAgICAgICBjb250ZXh0KCkucmVzdG9yZSgpOworICAgIH0K KwogcHJpdmF0ZToKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6Zmx1c2hEcmF3 aW5nQ29udGV4dDsKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6cHV0SW1hZ2VE YXRhOwo= 393389 2020-03-12 10:54:21 -0700 2020-09-29 14:46:25 -0700 Patch bug-208876-20200312105420.patch text/plain 2522 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZlNDZkMjMwZDlhNjY5NDAw MzBkZDdlNzgxNmQ0ZTlhZDdjYTgzMDIuLjJhM2U4MGY1ODQ4MDNkOWUxZDUxZTY3MmZkYzBlMDM3 MDM2NzM1Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDMtMTIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nl c3NdIFJlbW90ZUltYWdlQnVmZmVyUHJveHkgc2hvdWxkIGVuc3VyZSB0aGUgc3RhdGUgc3RhY2sg aW4gdGhlIGNvbnRleHQgaXMgY2xlYXJlZCBiZWZvcmUgZGVzdHJ1Y3Rpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODg3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSBzdGF0 ZSBzdGFjayBpbiB0aGUgY29udGV4dCBvZiBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5IGlzCisgICAg ICAgIGNsZWFyZWQgYmVmb3JlIGRlc3RydWN0aW9uLgorCisgICAgICAgIFRoZSBjb25uZWN0aW9u IGJldHdlZW4gR1BVUHJvY2VzcyBhbmQgV2ViUHJvY2VzcyBtYXkgaGF2ZSBiZWVuIHRlcm1pbmF0 ZWQKKyAgICAgICAgYmVmb3JlIGEgR3JhcGhpY3NDb250ZXh0OjpzYXZlKCkgcmVjZWl2ZXMgaXRz IG1hdGNoaW5nIHJlc3RvcmUoKS4KKworICAgICAgICAqIEdQVVByb2Nlc3MvZ3JhcGhpY3MvUmVt b3RlSW1hZ2VCdWZmZXJQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbWFnZUJ1ZmZl clByb3h5Ojp+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSk6CisKIDIwMjAtMDMtMTEgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nl c3NdIGVuY29kZU5hdGl2ZUltYWdlKCkgc2hvdWxkIHBhc3MgaW1hZ2VTaXplIHRvIEdyYXBoaWNz Q29udGV4dDo6ZHJhd05hdGl2ZUltYWdlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCmluZGV4IDE3ZDg3 YzU2ZGE4ZWZlZjg5OTJhNWNkMGMxNTVkODU3NmJmZWQzZDEuLjNkMTIxYTcyNDM1NzY5Y2RhZjFi NDIwM2E2YmNjNzVkZmZmMTk3OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vz cy9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApAQCAtMzYsNiArMzYs NyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIHRlbXBsYXRlPHR5cGVuYW1lIEJhY2tlbmRUeXBlPgog Y2xhc3MgUmVtb3RlSW1hZ2VCdWZmZXJQcm94eSA6IHB1YmxpYyBXZWJDb3JlOjpDb25jcmV0ZUlt YWdlQnVmZmVyPEJhY2tlbmRUeXBlPiwgcHVibGljIFJlbW90ZUltYWdlQnVmZmVyTWVzc2FnZUhh bmRsZXJQcm94eSwgcHVibGljIFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpSZXBsYXllcjo6RGVsZWdh dGUgewogICAgIHVzaW5nIEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyID0gV2ViQ29yZTo6Q29uY3Jl dGVJbWFnZUJ1ZmZlcjxCYWNrZW5kVHlwZT47CisgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VC dWZmZXI6OmNvbnRleHQ7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6Om1fYmFj a2VuZDsKIAogcHVibGljOgpAQCAtNTEsNiArNTIsMTYgQEAgcHVibGljOgogICAgICAgICBjcmVh dGVCYWNrZW5kKG1fYmFja2VuZC0+bG9naWNhbFNpemUoKSwgbV9iYWNrZW5kLT5iYWNrZW5kU2l6 ZSgpLCBtX2JhY2tlbmQtPnJlc29sdXRpb25TY2FsZSgpLCBtX2JhY2tlbmQtPmNvbG9yU3BhY2Uo KSwgbV9iYWNrZW5kLT5jcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGUoKSk7CiAgICAgfQog CisgICAgflJlbW90ZUltYWdlQnVmZmVyUHJveHkoKQorICAgIHsKKyNpZiBBU1NFUlRfRU5BQkxF RAorICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGUgc3RhdGUgc3RhY2sgaW4gdGhlIGNvbnRleHQg aXMgY2xlYXJlZCBiZWZvcmUKKyAgICAgICAgLy8gZGVzdHJ1Y3Rpb24sIHRvIGF2b2lkIGFzc2Vy dGlvbnMgaW4gdGhlIEdyYXBoaWNzQ29udGV4dCBkdG9yLgorICAgICAgICB3aGlsZSAoY29udGV4 dCgpLnN0YWNrU2l6ZSgpKQorICAgICAgICAgICAgY29udGV4dCgpLnJlc3RvcmUoKTsKKyNlbmRp ZgorICAgIH0KKwogcHJpdmF0ZToKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6 Zmx1c2hEcmF3aW5nQ29udGV4dDsKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6 cHV0SW1hZ2VEYXRhOwo= 410054 2020-09-29 14:46:26 -0700 2020-09-29 16:38:23 -0700 Reupload Said’s patch bug-208876-20200929144625.patch text/plain 2802 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU5ZDk3MTNkZDIzMGFkNzFj YWI3ZjY3MDkyMmJiNzE0YzY3ZTFhOWQuLjExMDEyNzdkMzg3OWE3MDQwZDk3ZmM2OTdhZjYyMDRj NDQ4MTYyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDktMjkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBS ZW1vdGVJbWFnZUJ1ZmZlclByb3h5IHNob3VsZCBlbnN1cmUgdGhlIHN0YXRlIHN0YWNrIG9mIHRo ZSBjb250ZXh0IGlzIGNsZWFyZWQgYmVmb3JlIGRlc3RydWN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg4NzYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJ1bm5pbmcgY2FudmFzIGxheW91 dCB0ZXN0cyBpbiBkZWJ1ZyBXZWJLaXQsIHRoZSBhc3NlcnRpb24gaW4gYH5HcmFwaGljc0NvbnRl eHQoKWAgd2hpY2ggdmVyaWZpZXMgdGhhdAorICAgICAgICBgbV9zdGFjay5pc0VtcHR5KClgIGZp cmVzLiBUaGlzIG9jY3VycyBiZWNhdXNlIHRoZSBtYXRjaGluZyBjYWxsIHRvIHJlc3RvcmUgbWF5 IHN0aWxsIGJlIGJ1ZmZlcmVkIGluIHRoZSB3ZWIKKyAgICAgICAgcHJvY2VzcyB3aGVuIHRoZSBy ZW1vdGUgaW1hZ2UgYnVmZmVyIHByb3h5IGluIHRoZSBHUFUgcHJvY2VzcyBpcyBkZXN0cm95ZWQ7 IGhvd2V2ZXIsIHRoaXMgbWF5IGFsc28gb2NjdXIgaWYgdGhlCisgICAgICAgIHdlYiBwcm9jZXNz IHRlcm1pbmF0ZXMgd2l0aG91dCBoYXZpbmcgc2VudCB0aGUgbWF0Y2hpbmcgY2FsbHMgdG8gcmVz dG9yZSB0aGUgZ3JhcGhpY3MgY29udGV4dC4KKworICAgICAgICBXZSBjYW4gZml4IGJvdGggb2Yg dGhlc2Ugc2NlbmFyaW9zIGJ5IG1hbnVhbGx5IHVud2luZGluZyB0aGUgY29udGV4dCdzIHN0YXRl IHN0YWNrIHdoZW4gZGVzdHJveWluZyB0aGUKKyAgICAgICAgYFJlbW90ZUltYWdlQnVmZmVyUHJv eHlgLiBPcmlnaW5hbCBwYXRjaCBieSBTYWlkIEFib3UtSGFsbGF3YS4KKworICAgICAgICAqIEdQ VVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVJbWFnZUJ1ZmZlclByb3h5Ojp+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSk6CisK IDIwMjAtMDktMjkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgc3R1YnMgZm9yIEF1ZGlvV29ya2xldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQv R1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmgKaW5kZXggOGViOTc5 Zjg5MWRhMjY5YjI2Yjc2ZDc4MDIwOWNmODViY2MxMTE3Yi4uODFiODk3OGQwZTc5MTE1N2Y5Yzdl NDk3MDM5ODE3ZTQ3OTU5ZTUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNz L2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQ VVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCkBAIC0zNiw2ICszNiw3 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogdGVtcGxhdGU8dHlwZW5hbWUgQmFja2VuZFR5cGU+CiBj bGFzcyBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5IDogcHVibGljIFdlYkNvcmU6OkNvbmNyZXRlSW1h Z2VCdWZmZXI8QmFja2VuZFR5cGU+LCBwdWJsaWMgUmVtb3RlSW1hZ2VCdWZmZXJNZXNzYWdlSGFu ZGxlclByb3h5LCBwdWJsaWMgV2ViQ29yZTo6RGlzcGxheUxpc3Q6OlJlcGxheWVyOjpEZWxlZ2F0 ZSB7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXIgPSBXZWJDb3JlOjpDb25jcmV0 ZUltYWdlQnVmZmVyPEJhY2tlbmRUeXBlPjsKKyAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1 ZmZlcjo6Y29udGV4dDsKICAgICB1c2luZyBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6bV9iYWNr ZW5kOwogCiBwdWJsaWM6CkBAIC01MSw2ICs1MiwxNCBAQCBwdWJsaWM6CiAgICAgICAgIGNyZWF0 ZUJhY2tlbmQobV9iYWNrZW5kLT5sb2dpY2FsU2l6ZSgpLCBtX2JhY2tlbmQtPmJhY2tlbmRTaXpl KCksIG1fYmFja2VuZC0+cmVzb2x1dGlvblNjYWxlKCksIG1fYmFja2VuZC0+Y29sb3JTcGFjZSgp LCBtX2JhY2tlbmQtPmNyZWF0ZUltYWdlQnVmZmVyQmFja2VuZEhhbmRsZSgpKTsKICAgICB9CiAK KyAgICB+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSgpCisgICAgeworICAgICAgICAvLyBVbndpbmQg dGhlIGNvbnRleHQncyBzdGF0ZSBzdGFjayBiZWZvcmUgZGVzdHJ1Y3Rpb24sIHNpbmNlIGNhbGxz IHRvIHJlc3RvcmUgbWF5IG5vdCBoYXZlCisgICAgICAgIC8vIGJlZW4gZmx1c2hlZCB5ZXQsIG9y IHRoZSB3ZWIgcHJvY2VzcyBtYXkgaGF2ZSB0ZXJtaW5hdGVkLgorICAgICAgICB3aGlsZSAoY29u dGV4dCgpLnN0YWNrU2l6ZSgpKQorICAgICAgICAgICAgY29udGV4dCgpLnJlc3RvcmUoKTsKKyAg ICB9CisKIHByaXZhdGU6CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OmZsdXNo RHJhd2luZ0NvbnRleHQ7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OnB1dElt YWdlRGF0YTsK