202491 2019-10-02 13:35:57 -0700 Fix determination of the top-level resource 2019-10-04 14:17:31 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin achristensen aestes beidson bfulgham cdumez commit-queue webkit-bug-importer youennf oldest_to_newest 1576147 0 krollin 2019-10-02 13:35:57 -0700 When loading the resources associated with a page, the Networking process needs to know the main resource for the main frame. It uses this information to keep track of page loads and the resources that are loaded in those pages. By keeping track of this information, WebKit can track and report difficult (slow or incomplete) resource loads and their impact on the overall page. The initial determination of the top resource only looked at whether the resource was the "main" resource of a frame or not. However, this determination was insufficient, and would confuse the tracking mechanism when sub-frames also had main frames. Therefore, augment the test by also looking to see if the hosting frame is the main frame. 1576149 1 krollin 2019-10-02 13:36:09 -0700 <rdar://problem/50780648> 1576150 2 380053 krollin 2019-10-02 13:37:38 -0700 Created attachment 380053 Patch 1576743 3 380053 youennf 2019-10-03 23:51:38 -0700 Comment on attachment 380053 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380053&action=review > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:171 > + m_networkActivityTracker = m_connection->startTrackingResourceLoad(m_parameters.webPageID, m_parameters.identifier, isMainResource() && isMainFrameLoad()); if isMainFrameLoad() is true, isMainResource() should also be true. I think we can remove the isMainResource() check. 1576996 4 380248 krollin 2019-10-04 13:39:35 -0700 Created attachment 380248 Made suggested change. 1577011 5 380248 commit-queue 2019-10-04 14:17:29 -0700 Comment on attachment 380248 Made suggested change. Clearing flags on attachment: 380248 Committed r250745: <https://trac.webkit.org/changeset/250745> 1577012 6 commit-queue 2019-10-04 14:17:31 -0700 All reviewed patches have been landed. Closing bug. 380053 2019-10-02 13:37:38 -0700 2019-10-04 13:39:33 -0700 Patch bug-202491-20191002133737.patch text/plain 4790 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1YWExZWU4OTdlMzg0ZjRh NWI2MGIyOWI0MmIyMzFiOWFlYjAyMTUuLmJlYmE3OGY4ODJlNTZlMmQwZGRhYjljMTljNmNhN2Qy NjQxMjBlZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMTAtMDIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBkZXRlcm1pbmF0aW9uIG9m IHRoZSB0b3AtbGV2ZWwgcmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjQ5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTA3ODA2NDg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBs b2FkaW5nIHRoZSByZXNvdXJjZXMgYXNzb2NpYXRlZCB3aXRoIGEgcGFnZSwgdGhlIE5ldHdvcmtp bmcKKyAgICAgICAgcHJvY2VzcyBuZWVkcyB0byBrbm93IHRoZSBtYWluIHJlc291cmNlIGZvciB0 aGUgbWFpbiBmcmFtZS4gSXQgdXNlcworICAgICAgICB0aGlzIGluZm9ybWF0aW9uIHRvIGtlZXAg dHJhY2sgb2YgcGFnZSBsb2FkcyBhbmQgdGhlIHJlc291cmNlcyB0aGF0CisgICAgICAgIGFyZSBs b2FkZWQgaW4gdGhvc2UgcGFnZXMuIEJ5IGtlZXBpbmcgdHJhY2sgb2YgdGhpcyBpbmZvcm1hdGlv biwKKyAgICAgICAgV2ViS2l0IGNhbiB0cmFjayBhbmQgcmVwb3J0IGRpZmZpY3VsdCAoc2xvdyBv ciBpbmNvbXBsZXRlKSByZXNvdXJjZQorICAgICAgICBsb2FkcyBhbmQgdGhlaXIgaW1wYWN0IG9u IHRoZSBvdmVyYWxsIHBhZ2UuCisKKyAgICAgICAgVGhlIGluaXRpYWwgZGV0ZXJtaW5hdGlvbiBv ZiB0aGUgdG9wIHJlc291cmNlIG9ubHkgbG9va2VkIGF0IHdoZXRoZXIKKyAgICAgICAgdGhlIHJl c291cmNlIHdhcyB0aGUgIm1haW4iIHJlc291cmNlIG9mIGEgZnJhbWUgb3Igbm90LiBIb3dldmVy LCB0aGlzCisgICAgICAgIGRldGVybWluYXRpb24gd2FzIGluc3VmZmljaWVudCwgYW5kIHdvdWxk IGNvbmZ1c2UgdGhlIHRyYWNraW5nCisgICAgICAgIG1lY2hhbmlzbSB3aGVuIHN1Yi1mcmFtZXMg YWxzbyBoYWQgbWFpbiBmcmFtZXMuIFRoZXJlZm9yZSwgYXVnbWVudCB0aGUKKyAgICAgICAgdGVz dCBieSBhbHNvIGxvb2tpbmcgdG8gc2VlIGlmIHRoZSBob3N0aW5nIGZyYW1lIGlzIHRoZSBtYWlu IGZyYW1lLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzczo6c3RhcnRUcmFja2luZ1Jlc291cmNlTG9hZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UmVzb3VyY2VMb2FkZXI6OnN0YXJ0KToKKwogMjAxOS0xMC0wMiAgRGVhbiBKYWNrc29uICA8ZGlu b0BhcHBsZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSBvcmlnaW5hdGluZyB3ZWJzaXRlIFVSTCB0 byBBUiBRdWlja0xvb2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKaW5kZXggMTI4Yzg5YzRk Y2M0NTQwMTJiYjBlZmMzMzJkYzg1ZDBlM2EzNDhjMi4uNzRmZDM2M2RiN2RjZDg0NjY1N2VkNWU2 MzUwNjMyYWYyNDAzZGI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKQEAgLTc2MSw3 ICs3NjEsNyBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpyZXNldE9yaWdp bkFjY2Vzc1doaXRlbGlzdHMoKQogICAgIFNlY3VyaXR5UG9saWN5OjpyZXNldE9yaWdpbkFjY2Vz c1doaXRlbGlzdHMoKTsKIH0KIAotT3B0aW9uYWw8TmV0d29ya0FjdGl2aXR5VHJhY2tlcj4gTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnN0YXJ0VHJhY2tpbmdSZXNvdXJjZUxvYWQoUGFn ZUlkZW50aWZpZXIgcGFnZUlELCBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIHJlc291cmNlSUQsIGJv b2wgaXNNYWluUmVzb3VyY2UpCitPcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2VyPiBOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c3RhcnRUcmFja2luZ1Jlc291cmNlTG9hZChQYWdl SWRlbnRpZmllciBwYWdlSUQsIFJlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VJRCwgYm9v bCBpc1RvcFJlc291cmNlKQogewogICAgIGlmIChtX3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgpKQog ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwpAQCAtNzcwLDcgKzc3MCw3IEBAIE9wdGlvbmFs PE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI+IE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpz dGFydFRyYWNraW5nUmVzCiAgICAgLy8gbmV3IG9uZSBpZiB0aGlzIGlzIHRoZSBtYWluIHJlc291 cmNlLgogCiAgICAgc2l6ZV90IHJvb3RBY3Rpdml0eUluZGV4OwotICAgIGlmIChpc01haW5SZXNv dXJjZSkgeworICAgIGlmIChpc1RvcFJlc291cmNlKSB7CiAgICAgICAgIC8vIElmIHdlJ3JlIGxv YWRpbmcgYSBwYWdlIGZyb20gdGhlIHRvcCwgbWFrZSBzdXJlIGFueSB0cmFja2luZyBvZgogICAg ICAgICAvLyBwcmV2aW91cyBhY3Rpdml0eSBmb3IgdGhpcyBwYWdlIGlzIHN0b3BwZWQuCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MuaAppbmRleCA2ZjdmN2ZhNzFjZDczODA0Y2M4OWQ5ZmUyYTMzMWNh MTY3NmUwOTdhLi43ZDhiYTMyZWJlNzMxZDA2ZjFiYmE3YTY4NThlMDYxYWJjNTE3MmY4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2Vzcy5oCkBAIC0xNDQsNyArMTQ0LDcgQEAgcHVibGljOgogICAgICAg ICBtX25ldHdvcmtMb2FkSW5mb3JtYXRpb25CeUlELnJlbW92ZShpZGVudGlmaWVyKTsKICAgICB9 CiAKLSAgICBPcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2VyPiBzdGFydFRyYWNraW5nUmVz b3VyY2VMb2FkKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyLCBSZXNvdXJjZUxvYWRJZGVudGlmaWVy IHJlc291cmNlSUQsIGJvb2wgaXNNYWluUmVzb3VyY2UpOworICAgIE9wdGlvbmFsPE5ldHdvcmtB Y3Rpdml0eVRyYWNrZXI+IHN0YXJ0VHJhY2tpbmdSZXNvdXJjZUxvYWQoV2ViQ29yZTo6UGFnZUlk ZW50aWZpZXIsIFJlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VJRCwgYm9vbCBpc1RvcFJl c291cmNlKTsKICAgICB2b2lkIHN0b3BUcmFja2luZ1Jlc291cmNlTG9hZChSZXNvdXJjZUxvYWRJ ZGVudGlmaWVyIHJlc291cmNlSUQsIE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI6OkNvbXBsZXRpb25D b2RlKTsKIAogICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6QmxvYkRhdGFGaWxlUmVmZXJlbmNl Pj4gcmVzb2x2ZUJsb2JSZWZlcmVuY2VzKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNDE4NzVjM2YwNzY1ZDZlZDIzMGVjNmRmMGJmNzFlNDU2 OTkzNmUyZi4uNmMyNzc1ODY3NDE0ZTNiNWY1Y2E0N2IwZjY4NmUyNTliOTNlM2NhMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcApAQCAtMTY4LDcgKzE2OCw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpz dGFydCgpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgIG1fbmV0d29y a0FjdGl2aXR5VHJhY2tlciA9IG1fY29ubmVjdGlvbi0+c3RhcnRUcmFja2luZ1Jlc291cmNlTG9h ZChtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWlu UmVzb3VyY2UoKSk7CisgICAgbV9uZXR3b3JrQWN0aXZpdHlUcmFja2VyID0gbV9jb25uZWN0aW9u LT5zdGFydFRyYWNraW5nUmVzb3VyY2VMb2FkKG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFy YW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpICYmIGlzTWFpbkZyYW1lTG9hZCgp KTsKIAogICAgIEFTU0VSVCghbV93YXNTdGFydGVkKTsKICAgICBtX3dhc1N0YXJ0ZWQgPSB0cnVl Owo= 380248 2019-10-04 13:39:35 -0700 2019-10-04 14:17:29 -0700 Made suggested change. bug-202491-20191004133934.patch text/plain 4769 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1YWExZWU4OTdlMzg0ZjRh NWI2MGIyOWI0MmIyMzFiOWFlYjAyMTUuLjJmNzlkMWExY2ZhZWU2YmUwNWRjMTJjM2YwYTliMmEx MzYzZDMxNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMTAtMDIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBkZXRlcm1pbmF0aW9uIG9m IHRoZSB0b3AtbGV2ZWwgcmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjQ5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTA3ODA2NDg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBXaGVuIGxv YWRpbmcgdGhlIHJlc291cmNlcyBhc3NvY2lhdGVkIHdpdGggYSBwYWdlLCB0aGUgTmV0d29ya2lu ZworICAgICAgICBwcm9jZXNzIG5lZWRzIHRvIGtub3cgdGhlIG1haW4gcmVzb3VyY2UgZm9yIHRo ZSBtYWluIGZyYW1lLiBJdCB1c2VzCisgICAgICAgIHRoaXMgaW5mb3JtYXRpb24gdG8ga2VlcCB0 cmFjayBvZiBwYWdlIGxvYWRzIGFuZCB0aGUgcmVzb3VyY2VzIHRoYXQKKyAgICAgICAgYXJlIGxv YWRlZCBpbiB0aG9zZSBwYWdlcy4gQnkga2VlcGluZyB0cmFjayBvZiB0aGlzIGluZm9ybWF0aW9u LAorICAgICAgICBXZWJLaXQgY2FuIHRyYWNrIGFuZCByZXBvcnQgZGlmZmljdWx0IChzbG93IG9y IGluY29tcGxldGUpIHJlc291cmNlCisgICAgICAgIGxvYWRzIGFuZCB0aGVpciBpbXBhY3Qgb24g dGhlIG92ZXJhbGwgcGFnZS4KKworICAgICAgICBUaGUgaW5pdGlhbCBkZXRlcm1pbmF0aW9uIG9m IHRoZSB0b3AgcmVzb3VyY2Ugb25seSBsb29rZWQgYXQgd2hldGhlcgorICAgICAgICB0aGUgcmVz b3VyY2Ugd2FzIHRoZSAibWFpbiIgcmVzb3VyY2Ugb2YgYSBmcmFtZSBvciBub3QuIEhvd2V2ZXIs IHRoaXMKKyAgICAgICAgZGV0ZXJtaW5hdGlvbiB3YXMgaW5zdWZmaWNpZW50LCBhbmQgd291bGQg Y29uZnVzZSB0aGUgdHJhY2tpbmcKKyAgICAgICAgbWVjaGFuaXNtIHdoZW4gc3ViLWZyYW1lcyBh bHNvIGhhZCBtYWluIGZyYW1lcy4gVGhlcmVmb3JlLCBhdWdtZW50IHRoZQorICAgICAgICB0ZXN0 IGJ5IGFsc28gbG9va2luZyB0byBzZWUgaWYgdGhlIGhvc3RpbmcgZnJhbWUgaXMgdGhlIG1haW4g ZnJhbWUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpzdGFydFRyYWNraW5nUmVzb3VyY2VMb2FkKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorCiAyMDE5LTEwLTAyICBEZWFuIEphY2tzb24gIDxkaW5v QGFwcGxlLmNvbT4KIAogICAgICAgICBQcm92aWRlIG9yaWdpbmF0aW5nIHdlYnNpdGUgVVJMIHRv IEFSIFF1aWNrTG9vawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRleCAxMjhjODljNGRj YzQ1NDAxMmJiMGVmYzMzMmRjODVkMGUzYTM0OGMyLi43NGZkMzYzZGI3ZGNkODQ2NjU3ZWQ1ZTYz NTA2MzJhZjI0MDNkYjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcApAQCAtNzYxLDcg Kzc2MSw3IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlc2V0T3JpZ2lu QWNjZXNzV2hpdGVsaXN0cygpCiAgICAgU2VjdXJpdHlQb2xpY3k6OnJlc2V0T3JpZ2luQWNjZXNz V2hpdGVsaXN0cygpOwogfQogCi1PcHRpb25hbDxOZXR3b3JrQWN0aXZpdHlUcmFja2VyPiBOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c3RhcnRUcmFja2luZ1Jlc291cmNlTG9hZChQYWdl SWRlbnRpZmllciBwYWdlSUQsIFJlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VJRCwgYm9v bCBpc01haW5SZXNvdXJjZSkKK09wdGlvbmFsPE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI+IE5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzdGFydFRyYWNraW5nUmVzb3VyY2VMb2FkKFBhZ2VJ ZGVudGlmaWVyIHBhZ2VJRCwgUmVzb3VyY2VMb2FkSWRlbnRpZmllciByZXNvdXJjZUlELCBib29s IGlzVG9wUmVzb3VyY2UpCiB7CiAgICAgaWYgKG1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpCiAg ICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC03NzAsNyArNzcwLDcgQEAgT3B0aW9uYWw8 TmV0d29ya0FjdGl2aXR5VHJhY2tlcj4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnN0 YXJ0VHJhY2tpbmdSZXMKICAgICAvLyBuZXcgb25lIGlmIHRoaXMgaXMgdGhlIG1haW4gcmVzb3Vy Y2UuCiAKICAgICBzaXplX3Qgcm9vdEFjdGl2aXR5SW5kZXg7Ci0gICAgaWYgKGlzTWFpblJlc291 cmNlKSB7CisgICAgaWYgKGlzVG9wUmVzb3VyY2UpIHsKICAgICAgICAgLy8gSWYgd2UncmUgbG9h ZGluZyBhIHBhZ2UgZnJvbSB0aGUgdG9wLCBtYWtlIHN1cmUgYW55IHRyYWNraW5nIG9mCiAgICAg ICAgIC8vIHByZXZpb3VzIGFjdGl2aXR5IGZvciB0aGlzIHBhZ2UgaXMgc3RvcHBlZC4KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVj dGlvblRvV2ViUHJvY2Vzcy5oCmluZGV4IDZmN2Y3ZmE3MWNkNzM4MDRjYzg5ZDlmZTJhMzMxY2Ex Njc2ZTA5N2EuLjdkOGJhMzJlYmU3MzFkMDZmMWJiYTdhNjg1OGUwNjFhYmM1MTcyZjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzLmgKQEAgLTE0NCw3ICsxNDQsNyBAQCBwdWJsaWM6CiAgICAgICAg IG1fbmV0d29ya0xvYWRJbmZvcm1hdGlvbkJ5SUQucmVtb3ZlKGlkZW50aWZpZXIpOwogICAgIH0K IAotICAgIE9wdGlvbmFsPE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI+IHN0YXJ0VHJhY2tpbmdSZXNv dXJjZUxvYWQoV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIsIFJlc291cmNlTG9hZElkZW50aWZpZXIg cmVzb3VyY2VJRCwgYm9vbCBpc01haW5SZXNvdXJjZSk7CisgICAgT3B0aW9uYWw8TmV0d29ya0Fj dGl2aXR5VHJhY2tlcj4gc3RhcnRUcmFja2luZ1Jlc291cmNlTG9hZChXZWJDb3JlOjpQYWdlSWRl bnRpZmllciwgUmVzb3VyY2VMb2FkSWRlbnRpZmllciByZXNvdXJjZUlELCBib29sIGlzVG9wUmVz b3VyY2UpOwogICAgIHZvaWQgc3RvcFRyYWNraW5nUmVzb3VyY2VMb2FkKFJlc291cmNlTG9hZElk ZW50aWZpZXIgcmVzb3VyY2VJRCwgTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNv ZGUpOwogCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpCbG9iRGF0YUZpbGVSZWZlcmVuY2U+ PiByZXNvbHZlQmxvYlJlZmVyZW5jZXMoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRl cnMmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcAppbmRleCA0MTg3NWMzZjA3NjVkNmVkMjMwZWM2ZGYwYmY3MWU0NTY5 OTM2ZTJmLi5mYjM3MmQ3OWRlY2I5NmNlYTUxYjdjZTQzMTNmZjQ2ODExYzE5ZGJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0 YXJ0KCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgbV9uZXR3b3Jr QWN0aXZpdHlUcmFja2VyID0gbV9jb25uZWN0aW9uLT5zdGFydFRyYWNraW5nUmVzb3VyY2VMb2Fk KG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5S ZXNvdXJjZSgpKTsKKyAgICBtX25ldHdvcmtBY3Rpdml0eVRyYWNrZXIgPSBtX2Nvbm5lY3Rpb24t PnN0YXJ0VHJhY2tpbmdSZXNvdXJjZUxvYWQobV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJh bWV0ZXJzLmlkZW50aWZpZXIsIGlzTWFpbkZyYW1lTG9hZCgpKTsKIAogICAgIEFTU0VSVCghbV93 YXNTdGFydGVkKTsKICAgICBtX3dhc1N0YXJ0ZWQgPSB0cnVlOwo=