165237 2016-11-30 18:02:03 -0800 [GTK] The inspector is broken when AC support is disabled 2017-01-25 05:27:25 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 clopez magomez achristensen bugs-noreply cgarcia commit-queue esprehn+autocc glenn kondapallykalyan magomez mcatanzaro mike simon.fraser thorton tpopela yoon zan oldest_to_newest 1255098 0 clopez 2016-11-30 18:02:03 -0800 If WebKitGTK+ is built without OpenGL support, or it is started with this support disabled via the environment variable WEBKIT_DISABLE_COMPOSITING_MODE, then the inspector window is broken. Doing right click, inspect element will show a black or empty window and will end crashing the webprocess. 1268220 1 mike 2017-01-19 16:01:20 -0800 *** Bug 167218 has been marked as a duplicate of this bug. *** 1268221 2 mike 2017-01-19 16:02:33 -0800 Per the duplicate, this is making debugging CSS and JS issues in the WK2 port of Geary somewhat difficult. 1268437 3 cgarcia 2017-01-20 08:42:10 -0800 This is not specific to GTK+, but I guess it doesn't happen in other ports based on coordinated graphics because they don't allow to disable accelerated compositing. The problem is that PageOverlay depends on accelerated compositing and assumes it's always available. We get also crashes if accelerated compositing is not forced when the roo layer is detached, because the page overlay controller keep its graphics layer alive. In coordinated graphics the layers have a coordinator associated, when the coordinator is destroyed, it expects all the layers to be also destroyed, but that's not true for the page olverlays. So, I think we should do two things here: 1. Do not use page overlays when accelerated compositing is disabled. The same way RenderLayercompositor doesn't create any GraphicsLayer when AC is disabled. Features depending on page overlays will not work of course, but that's better than crashing. I think the GTK+ port only uses page overlays for the inspector highlights, so not a big deal. 2. When RenderLayerCompositor detaches the root layer, and we leave accelerated compositor mode, the page overlays should be destroyed to ensure we don't leave any GraphicsLayer pointing to a deleted coordindator. 1268439 4 mcatanzaro 2017-01-20 09:14:10 -0800 (Also: Geary should really seriously consider disabling JS if at all possible, like Evolution does.) 1269426 5 299601 magomez 2017-01-24 08:40:02 -0800 Created attachment 299601 Patch 1269738 6 299601 cgarcia 2017-01-24 23:23:02 -0800 Comment on attachment 299601 Patch Thanks for the patch! This looks good to me, r=me but I would like someone more familiarized with the page overlays and compositor code confirms this is ok, so also setting cq-. 1269742 7 299601 thorton 2017-01-24 23:32:47 -0800 Comment on attachment 299601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299601&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:773 > void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList) Is this sufficient? What about view-relative overlays? Maybe they get installed in a different way, I don't really remember. > Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp:110 > + if (!m_page->corePage()->settings().acceleratedCompositingEnabled()) > + return; These are just a few of the many places PageOverlays are used; should we perhaps instead proceed with the installation and just not install layers? (And then if a root layer is attached they'll just start working?) 1269744 8 cgarcia 2017-01-24 23:39:58 -0800 (In reply to comment #7) > Comment on attachment 299601 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=299601&action=review > > > Source/WebCore/rendering/RenderLayerCompositor.cpp:773 > > void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList) > > Is this sufficient? What about view-relative overlays? Maybe they get > installed in a different way, I don't really remember. I think this is enough for GTK+ port, I think we only use overlays for the inspector. But this is not really a GTK+ specific issue, it just happens that GTK+ port is probably the only one that still allows to disable AC. 1269745 9 thorton 2017-01-24 23:42:39 -0800 (In reply to comment #8) > (In reply to comment #7) > > Comment on attachment 299601 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=299601&action=review > > > > > Source/WebCore/rendering/RenderLayerCompositor.cpp:773 > > > void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList) > > > > Is this sufficient? What about view-relative overlays? Maybe they get > > installed in a different way, I don't really remember. > > I think this is enough for GTK+ port, I think we only use overlays for the > inspector. But this is not really a GTK+ specific issue, it just happens > that GTK+ port is probably the only one that still allows to disable AC. Right, what I should have said was "this seems like a somewhat haphazard way to fix this, maybe instead of checking this bit at the callsites we should check it at the bottleneck inside PageOverlayController instead, so that we never get it wrong in the future and don't have settings checks scattered in random places" 1269758 10 magomez 2017-01-25 00:42:20 -0800 > Right, what I should have said was "this seems like a somewhat haphazard way > to fix this, maybe instead of checking this bit at the callsites we should > check it at the bottleneck inside PageOverlayController instead, so that we > never get it wrong in the future and don't have settings checks scattered in > random places" Even moving the check to PageOverlayController, which would be an option as you mention, we want to avoid the creation of GraphicsLayers in the caller as well. This is needed in GTK+ because requesting the GraphicsLayerFactory causes AC mode to be enabled. So in any case the callers need to be modified as well. Or am I missing something? 1269760 11 thorton 2017-01-25 00:44:40 -0800 (In reply to comment #10) > > Right, what I should have said was "this seems like a somewhat haphazard way > > to fix this, maybe instead of checking this bit at the callsites we should > > check it at the bottleneck inside PageOverlayController instead, so that we > > never get it wrong in the future and don't have settings checks scattered in > > random places" > > Even moving the check to PageOverlayController, which would be an option as > you mention, we want to avoid the creation of GraphicsLayers in the caller > as well. This is needed in GTK+ because requesting the GraphicsLayerFactory > causes AC mode to be enabled. So in any case the callers need to be modified > as well. Or am I missing something? Ah, fair point, I didn't realize the inspector made sublayers, but it does. Carry on! 1269781 12 299601 commit-queue 2017-01-25 05:27:19 -0800 Comment on attachment 299601 Patch Clearing flags on attachment: 299601 Committed r211141: <http://trac.webkit.org/changeset/211141> 1269782 13 commit-queue 2017-01-25 05:27:25 -0800 All reviewed patches have been landed. Closing bug. 299601 2017-01-24 08:40:02 -0800 2017-01-25 05:27:19 -0800 Patch bug-165237-20170124173802.patch text/plain 6118 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVjM2U2Yjc3MzIyM2E4 NjQwZTM5ZjFmMDFjZGVmMGVlOGY0YTFiMS4uODZhNWJmMTU5ODBjMGFiMDY2OTM0MzE1OTE4MGRk YjRjMTYyYjMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTAxLTI0ICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gVGhlIGluc3Bl Y3RvciBpcyBicm9rZW4gd2hlbiBBQyBzdXBwb3J0IGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUyMzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgdGhhdCBQYWdlT3Zlcmxh eUNvbnRyb2xsZXIgZGVzdHJveXMgaXRzIHJvb3QgR3JhcGhpY3NMYXllcnMgd2hlbiBsZWF2aW5n IEFDLiBUaGV5CisgICAgICAgIHdpbGwgYmUgcmVjcmVhdGVkIGlmIHdlIGVudGVyIEFDIGFnYWlu LCBhdm9pZGluZyBhIGNyYXNoIGJlY2F1c2UgdGhlIGxheWVycyBkb24ndCBiZWxvbmcgdG8KKyAg ICAgICAgdGhlIGFwcHJvcHJpYXRlIGNvbXBvc2l0b3IuIEFsc28sIGRvbid0IGFwcGVuZCB0aGUg ZG9jdW1lbnQgb3ZlcmxheSBsYXllcnMgaWYgd2UgYXJlIG5vdAorICAgICAgICBpbiBjb21wb3Np dGluZyBtb2RlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhZGRlZC4KKworICAgICAgICAqIHBh Z2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VPdmVy bGF5Q29udHJvbGxlcjo6d2lsbERldGFjaFJvb3RMYXllcik6CisgICAgICAgICogcGFnZS9QYWdl T3ZlcmxheUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6YXBw ZW5kRG9jdW1lbnRPdmVybGF5TGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6ZGV0YWNoUm9vdExheWVyKToKKwogMjAxNy0wMS0yNCAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBhbHdheXMgdHJ1ZSBh bGxvd0N1c3RvbVNjcm9sbGJhckluTWFpbkZyYW1lIHNldHRpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwZTdi ZGNlYjllNzcxNzBmYmFmMGQ2ZDBiNjFkNmVjYmM4ZDg4N2ZjLi5kNzIxZDdlZDEzYWE2ZTgwY2Jj ODcwMjczYWZjNTMxZjc2ODQ4OThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTct MDEtMjQgIE1pZ3VlbCBHb21leiAgPG1hZ29tZXpAaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RL XSBUaGUgaW5zcGVjdG9yIGlzIGJyb2tlbiB3aGVuIEFDIHN1cHBvcnQgaXMgZGlzYWJsZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTIzNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3Rv ciBtdXN0IG5vdCB1c2UgUGFnZU92ZXJsYXlzIG9yIEdyYXBoaWNzTGF5ZXJzIHdoZW4gQUMgaXMg bm90IGF2YWlhbGFibGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFkZGVkLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkluc3BlY3RvckNsaWVudDo6c2hvd1BhaW50UmVjdCk6CisKKzIwMTctMDEtMjQg IE1pZ3VlbCBHb21leiAgPG1hZ29tZXpAaWdhbGlhLmNvbT4KKwogICAgICAgICBbQ29vcmRpbmF0 ZWQgR3JhcGhpY3NdIEVuc3VyZSB0aGF0IHdlJ3JlIGluIEFDIG1vZGUgYmVmb3JlIHRyeWluZyB0 byBjcmVhdGUgR3JhcGhpY3NMYXllcnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzM2NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VPdmVybGF5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVy bGF5Q29udHJvbGxlci5jcHAKaW5kZXggMDU0M2JkNTM0ZDI1MWJhMzdkY2E0MjFkYTE3ZTJjOTkz YTJkYWYyYS4uOWYxZTU0YzE4ODZjZWQ2NGY5YmNjZWI3N2RmOWIwODY5OWM0ZmU1NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmNwcApAQCAtMjA3LDYg KzIwNywxMyBAQCB2b2lkIFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6d2lsbEF0dGFjaFJvb3RMYXll cigpCiAgICAgICAgIHVwZGF0ZU92ZXJsYXlHZW9tZXRyeSgqb3ZlcmxheUFuZExheWVyLmtleSwg Km92ZXJsYXlBbmRMYXllci52YWx1ZSk7CiB9CiAKK3ZvaWQgUGFnZU92ZXJsYXlDb250cm9sbGVy Ojp3aWxsRGV0YWNoUm9vdExheWVyKCkKK3sKKyAgICBtX2RvY3VtZW50T3ZlcmxheVJvb3RMYXll ciA9IG51bGxwdHI7CisgICAgbV92aWV3T3ZlcmxheVJvb3RMYXllciA9IG51bGxwdHI7CisgICAg bV9pbml0aWFsaXplZCA9IGZhbHNlOworfQorCiB2b2lkIFBhZ2VPdmVybGF5Q29udHJvbGxlcjo6 ZGlkQ2hhbmdlVmlld1NpemUoKQogewogICAgIGZvciAoYXV0byYgb3ZlcmxheUFuZExheWVyIDog bV9vdmVybGF5R3JhcGhpY3NMYXllcnMpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVy bGF5Q29udHJvbGxlci5oCmluZGV4IDYzODk0N2M2MTg0NmFiMDY3NWNlODAzYWJmMTc2YjZiNzFk ZDhjMGIuLmJmYjQxMGQyMDg4YjIwZGRjYzQ1ZTM3M2I3MGQ0NGUyMjY3MDYwZjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaApAQCAtNTgsNiArNTgsNyBA QCBwdWJsaWM6CiAgICAgR3JhcGhpY3NMYXllciYgbGF5ZXJGb3JPdmVybGF5KFBhZ2VPdmVybGF5 JikgY29uc3Q7CiAKICAgICB2b2lkIHdpbGxBdHRhY2hSb290TGF5ZXIoKTsKKyAgICB2b2lkIHdp bGxEZXRhY2hSb290TGF5ZXIoKTsKIAogICAgIHZvaWQgZGlkQ2hhbmdlVmlld1NpemUoKTsKICAg ICB2b2lkIGRpZENoYW5nZURvY3VtZW50U2l6ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA2NWZkYzRkZmRhNDZmYmQy MmRiYmMzNDdhOTZiMjFjMmVlZGVjMTk3Li5lNDA1OTRmOTJlOTgwNTc3ZGU0NzAwZmNhMjczODJm ODlmMTNhNDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcApAQCAtNzcyLDcgKzc3Miw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBk YXRlCiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphcHBlbmREb2N1bWVudE92ZXJsYXlM YXllcnMoVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYgY2hpbGRMaXN0KQogewotICAgIGlmICghaXNN YWluRnJhbWVDb21wb3NpdG9yKCkpCisgICAgaWYgKCFpc01haW5GcmFtZUNvbXBvc2l0b3IoKSB8 fCAhbV9jb21wb3NpdGluZykKICAgICAgICAgcmV0dXJuOwogCiAgICAgRnJhbWUmIGZyYW1lID0g bV9yZW5kZXJWaWV3LmZyYW1lVmlldygpLmZyYW1lKCk7CkBAIC0zNTA5LDggKzM1MDksMTAgQEAg dm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFJvb3RMYXllcigpCiAgICAgY2FzZSBS b290TGF5ZXJBdHRhY2hlZFZpYUNocm9tZUNsaWVudDogewogICAgICAgICBGcmFtZSYgZnJhbWUg PSBtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkuZnJhbWUoKTsKICAgICAgICAgcGFnZSgpLmNocm9t ZSgpLmNsaWVudCgpLmF0dGFjaFJvb3RHcmFwaGljc0xheWVyKGZyYW1lLCBudWxscHRyKTsKLSAg ICAgICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1lKCkpCisgICAgICAgIGlmIChmcmFtZS5pc01haW5G cmFtZSgpKSB7CiAgICAgICAgICAgICBwYWdlKCkuY2hyb21lKCkuY2xpZW50KCkuYXR0YWNoVmll d092ZXJsYXlHcmFwaGljc0xheWVyKGZyYW1lLCBudWxscHRyKTsKKyAgICAgICAgICAgIGZyYW1l Lm1haW5GcmFtZSgpLnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLndpbGxEZXRhY2hSb290TGF5ZXIo KTsKKyAgICAgICAgfQogICAgIH0KICAgICBicmVhazsKICAgICBjYXNlIFJvb3RMYXllclVuYXR0 YWNoZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKaW5kZXggNDFiMzRmMDBhOGM2ZmQy MDNjNTgzNDIwM2U4MjgwYTVjNDQ1NmY3OS4uMWIwOWIwYzIzNzFiMDU1MzAzNjQ0ZmZjMzMxNDJi N2M2YzcyMTc2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtMzMsNiArMzMs NyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvTWFpbkZyYW1lLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Q YWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaD4KKyNpbmNs dWRlIDxXZWJDb3JlL1NldHRpbmdzLmg+CiAjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CiAK ICNpZiBQTEFURk9STShJT1MpCkBAIC0xMDUsNiArMTA2LDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JD bGllbnQ6OmRpZFJlc2l6ZU1haW5GcmFtZShGcmFtZSopCiAKIHZvaWQgV2ViSW5zcGVjdG9yQ2xp ZW50OjpoaWdobGlnaHQoKQogeworICAgIGlmICghbV9wYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5n cygpLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCkpCisgICAgICAgIHJldHVybjsKKwog I2lmICFQTEFURk9STShJT1MpCiAgICAgaWYgKCFtX2hpZ2hsaWdodE92ZXJsYXkpIHsKICAgICAg ICAgYXV0byBoaWdobGlnaHRPdmVybGF5ID0gUGFnZU92ZXJsYXk6OmNyZWF0ZSgqdGhpcyk7CkBA IC0xMzQsNiArMTM4LDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmhpZGVIaWdobGlnaHQo KQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6c2hvd1BhaW50UmVjdChjb25zdCBGbG9hdFJl Y3QmIHJlY3QpCiB7CisgICAgaWYgKCFtX3BhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkuYWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYg KCFtX3BhaW50UmVjdE92ZXJsYXkpIHsKICAgICAgICAgbV9wYWludFJlY3RPdmVybGF5ID0gUGFn ZU92ZXJsYXk6OmNyZWF0ZSgqdGhpcywgUGFnZU92ZXJsYXk6Ok92ZXJsYXlUeXBlOjpEb2N1bWVu dCk7CiAgICAgICAgIG1fcGFnZS0+bWFpbkZyYW1lKCktPnBhZ2VPdmVybGF5Q29udHJvbGxlcigp Lmluc3RhbGxQYWdlT3ZlcmxheSgqbV9wYWludFJlY3RPdmVybGF5LCBQYWdlT3ZlcmxheTo6RmFk ZU1vZGU6OkRvTm90RmFkZSk7Cg==