193843 2019-01-25 13:38:12 -0800 Document::updateMainArticleElementAfterLayout() should be a no-op when no client depends on knowing the main article element 2019-01-25 19:40:29 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193854 InRadar P2 Normal --- 1 simon.fraser wenson_hsieh bdakin cdumez commit-queue dbates esprehn+autocc ews-watchlist kangil.han rniwa simon.fraser thorton webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1498422 0 simon.fraser 2019-01-25 13:38:12 -0800 This is just wasted work. 1498425 1 wenson_hsieh 2019-01-25 13:41:10 -0800 That's a good point — we should totally gate this on Page's requestedLayoutMilestones(). Is this showing up in traces? 1498427 2 simon.fraser 2019-01-25 13:42:00 -0800 No, just reading code. That milestone is so weird, and shouldn't be invasive in Document and FrameView. It needs to be extracted. 1498491 3 wenson_hsieh 2019-01-25 14:51:56 -0800 (In reply to Simon Fraser (smfr) from comment #2) > No, just reading code. That milestone is so weird, and shouldn't be invasive > in Document and FrameView. It needs to be extracted. Where do you think this code should be extracted to? 1498544 4 360183 wenson_hsieh 2019-01-25 16:04:09 -0800 Created attachment 360183 Fixes the bug 1498545 5 wenson_hsieh 2019-01-25 16:06:57 -0800 (In reply to Simon Fraser (smfr) from comment #2) > (…) That milestone is so weird, and shouldn't be invasive in Document and FrameView. It needs to be extracted. Filed https://bugs.webkit.org/show_bug.cgi?id=193854 to track this. 1498546 6 360183 zalan 2019-01-25 16:08:44 -0800 Comment on attachment 360183 Fixes the bug Alternatively you could check this at the callsite (there's only one and we don't really expect more callers to have) and assert it here -to not bring in milestone logic to Document. 1498550 7 wenson_hsieh 2019-01-25 16:14:55 -0800 (In reply to zalan from comment #6) > Comment on attachment 360183 [details] > Fixes the bug > > Alternatively you could check this at the callsite (there's only one and we > don't really expect more callers to have) and assert it here -to not bring > in milestone logic to Document. Sounds reasonable. 1498555 8 360184 wenson_hsieh 2019-01-25 16:23:46 -0800 Created attachment 360184 v2 1498558 9 360184 zalan 2019-01-25 16:24:54 -0800 Comment on attachment 360184 v2 r=me but it will conflict with my change. 1498560 10 zalan 2019-01-25 16:26:11 -0800 (In reply to zalan from comment #9) > Comment on attachment 360184 [details] > v2 > > r=me but it will conflict with my change. https://trac.webkit.org/changeset/240519/webkit 1498582 11 wenson_hsieh 2019-01-25 16:54:51 -0800 (In reply to zalan from comment #9) > Comment on attachment 360184 [details] > v2 > > r=me but it will conflict with my change. Since the main article update call was moved into FrameView::updateHasReachedSignificantRenderedTextThreshold, we might as well just bail early in updateHasReachedSignificantRenderedTextThreshold if the client doesn't care about DidRenderSignificantAmountOfText. 1498586 12 360193 wenson_hsieh 2019-01-25 17:01:25 -0800 Created attachment 360193 Rebase on trunk 1498651 13 360193 commit-queue 2019-01-25 19:39:03 -0800 Comment on attachment 360193 Rebase on trunk Clearing flags on attachment: 360193 Committed r240539: <https://trac.webkit.org/changeset/240539> 1498652 14 commit-queue 2019-01-25 19:39:05 -0800 All reviewed patches have been landed. Closing bug. 1498654 15 webkit-bug-importer 2019-01-25 19:40:29 -0800 <rdar://problem/47570343> 360183 2019-01-25 16:04:09 -0800 2019-01-25 16:23:45 -0800 Fixes the bug bug-193843-20190125160408.patch text/plain 2151 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJlYzM1YWJiMGIzNzZi YzA5ZjM3NzQ1NGJkYzI1Y2UyMjBmNGQwZi4uMzQ5YzJkMmQ4OGU4ZmY4NmQ1ZjNkYjhkNmM2YTky NjUwY2M3YTNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIERvY3VtZW50Ojp1 cGRhdGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpIHNob3VsZCBiZSBhIG5vLW9wIHdo ZW4gbm8gY2xpZW50IGRlcGVuZHMgb24ga25vd2luZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0Rv Y3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVNYWluQXJ0aWNs ZUVsZW1lbnRBZnRlckxheW91dCk6CisKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBjdXJyZW50bHkg ZG9lcyBhIGJpdCBvZiB3YXN0ZWQgd29yayBhZnRlciBldmVyeSBsYXlvdXQsIG9uIGNsaWVudHMg dGhhdCBkb24ndCBsaXN0ZW4gdG8gdGhlCisgICAgICAgICJzaWduaWZpY2FudCByZW5kZXJlZCB0 ZXh0IiBsYXlvdXQgbWlsZXN0b25lIGFuZCB0aGVyZWZvcmUgZG9uJ3QgbmVlZCB0byBndWVzcyB0 aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQuIFNpbXBseQorICAgICAgICBkb24ndCBib3RoZXIga2Vl cGluZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQgdXAgdG8gZGF0ZSBpbiB0aGlzIHNjZW5hcmlv LgorCiAyMDE5LTAxLTI1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CiAgICAgICAgIFtpT1NdIFJlbmFtZSBzb21lIFdlYktpdC1pbnRlcm5hbCBmdW5jdGlvbnMgYW5k IHZhcmlhYmxlcyB0aGF0IHJlZmVyZW5jZSAiZGF0YSBpbnRlcmFjdGlvbiIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwCmluZGV4IGRhZTc3NTc4Y2U3NmE2MDcwZWU5ZTliM2IyOTk4ZjA1YjVlMmEwYzQu LmNiMjU1YTgxYmVhMzkyZjQzYmQ5OTRhNWM3ODFhYzZjOTM3YjU1MGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcApAQCAtODQwMSw2ICs4NDAxLDE0IEBAIHZvaWQgRG9jdW1lbnQ6OnVucmVnaXN0 ZXJBcnRpY2xlRWxlbWVudChFbGVtZW50JiBhcnRpY2xlKQogCiB2b2lkIERvY3VtZW50Ojp1cGRh dGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpCiB7CisgICAgYXV0byogcGFnZSA9IHRo aXMtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UgfHwgIShwYWdlLT5yZXF1ZXN0ZWRMYXlvdXRNaWxl c3RvbmVzKCkgJiBEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCkpIHsKKyAgICAgICAg Ly8gVGhpcyBtYWluIGFydGljbGUgZWxlbWVudCBoZXVyaXN0aWMgaXMgY3VycmVudGx5IG9ubHkg dXNlZCBmb3IgdGhlIHB1cnBvc2VzIG9mIGZpcmluZyB0aGUgc2lnbmlmaWNhbnQgcmVuZGVyZWQg dGV4dAorICAgICAgICAvLyBsYXlvdXQgbWlsZXN0b25lLiBJZiB0aGlzIGxheW91dCBtaWxlc3Rv bmUgaGFzIG5vdCBiZWVuIHJlcXVlc3RlZCwgd2UgZG9uJ3QgbmVlZCB0byBib3RoZXIga2VlcGlu ZyB0aGUgbWFpbiBhcnRpY2xlCisgICAgICAgIC8vIGVsZW1lbnQgdXAgdG8gZGF0ZS4KKyAgICAg ICAgcmV0dXJuOworICAgIH0KKwogICAgIC8vIElmIHRoZXJlIGFyZSB0b28gbWFueSBhcnRpY2xl IGVsZW1lbnRzIG9uIHRoZSBwYWdlLCBkb24ndCBjb25zaWRlciBhbnkgb25lIG9mIHRoZW0gdG8g YmUgIm1haW4gY29udGVudCIuCiAgICAgY29uc3QgdW5zaWduZWQgbWF4TnVtYmVyT2ZBcnRpY2xl c0JlZm9yZUlnbm9yaW5nTWFpbkNvbnRlbnRBcnRpY2xlID0gMTA7CiAK 360184 2019-01-25 16:23:46 -0800 2019-01-25 17:01:24 -0800 v2 bug-193843-20190125162346.patch text/plain 3075 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJlYzM1YWJiMGIzNzZi YzA5ZjM3NzQ1NGJkYzI1Y2UyMjBmNGQwZi4uMGMwYjg0OTA1ZjFiNjE1OTlkYTlkMjE3MTE0ODFl N2RkOWE3OTgxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAxLTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIERvY3VtZW50Ojp1 cGRhdGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpIHNob3VsZCBiZSBhIG5vLW9wIHdo ZW4gbm8gY2xpZW50IGRlcGVuZHMgb24ga25vd2luZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0Rv Y3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVNYWluQXJ0aWNs ZUVsZW1lbnRBZnRlckxheW91dCk6CisKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBjdXJyZW50bHkg ZG9lcyBhIGJpdCBvZiB3YXN0ZWQgd29yayBhZnRlciBldmVyeSBsYXlvdXQsIG9uIGNsaWVudHMg dGhhdCBkb24ndCBsaXN0ZW4gdG8gdGhlCisgICAgICAgICJzaWduaWZpY2FudCByZW5kZXJlZCB0 ZXh0IiBsYXlvdXQgbWlsZXN0b25lIGFuZCB0aGVyZWZvcmUgZG9uJ3QgbmVlZCB0byBndWVzcyB0 aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQuIFNpbXBseQorICAgICAgICBkb24ndCBib3RoZXIga2Vl cGluZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQgdXAgdG8gZGF0ZSBpbiB0aGlzIHNjZW5hcmlv IGJ5IG5vdCBpbnZva2luZyB0aGlzIGZ1bmN0aW9uIGluCisgICAgICAgIEZyYW1lVmlldzo6cGVy Zm9ybVBvc3RMYXlvdXRUYXNrcy4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGVyZm9ybVBvc3RMYXlvdXRUYXNrcyk6CisKIDIw MTktMDEtMjUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgW2lPU10gUmVuYW1lIHNvbWUgV2ViS2l0LWludGVybmFsIGZ1bmN0aW9ucyBhbmQgdmFyaWFi bGVzIHRoYXQgcmVmZXJlbmNlICJkYXRhIGludGVyYWN0aW9uIgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j cHAKaW5kZXggZGFlNzc1NzhjZTc2YTYwNzBlZTllOWIzYjI5OThmMDViNWUyYTBjNC4uOTVlNGRi N2JjNzY1NzhiYjcwYzQ5MTAzNWFjOGYyNjEzNjY5NGMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwCkBAIC04NDAxLDYgKzg0MDEsOCBAQCB2b2lkIERvY3VtZW50Ojp1bnJlZ2lzdGVyQXJ0aWNs ZUVsZW1lbnQoRWxlbWVudCYgYXJ0aWNsZSkKIAogdm9pZCBEb2N1bWVudDo6dXBkYXRlTWFpbkFy dGljbGVFbGVtZW50QWZ0ZXJMYXlvdXQoKQogeworICAgIEFTU0VSVChwYWdlKCkgJiYgcGFnZSgp LT5yZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkgJiBEaWRSZW5kZXJTaWduaWZpY2FudEFtb3Vu dE9mVGV4dCk7CisKICAgICAvLyBJZiB0aGVyZSBhcmUgdG9vIG1hbnkgYXJ0aWNsZSBlbGVtZW50 cyBvbiB0aGUgcGFnZSwgZG9uJ3QgY29uc2lkZXIgYW55IG9uZSBvZiB0aGVtIHRvIGJlICJtYWlu IGNvbnRlbnQiLgogICAgIGNvbnN0IHVuc2lnbmVkIG1heE51bWJlck9mQXJ0aWNsZXNCZWZvcmVJ Z25vcmluZ01haW5Db250ZW50QXJ0aWNsZSA9IDEwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKaW5kZXggN2NhNTZjMTlhMjE3MjYyZWE0ZGNhMTY3NjA4ZDYxZmM1MzQwODdlYi4uYzdmYTIx NzExYWFhYTJkYzY2MDg1YTE0NjUyZThiN2FhZTkyMDJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcApAQCAtMzMxMCw3ICszMzEwLDE0IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtUG9z dExheW91dFRhc2tzKCkKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBydW4gYW55IEphdmFT Y3JpcHQgY29kZSBpbiB0aGlzIGZ1bmN0aW9uLgogICAgIExPRyhMYXlvdXQsICJGcmFtZVZpZXcg JXAgcGVyZm9ybVBvc3RMYXlvdXRUYXNrcyIsIHRoaXMpOwogCi0gICAgZnJhbWUoKS5kb2N1bWVu dCgpLT51cGRhdGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpOworICAgIGF1dG8qIHBh Z2UgPSBmcmFtZSgpLnBhZ2UoKTsKKyAgICBpZiAocGFnZSAmJiBwYWdlLT5yZXF1ZXN0ZWRMYXlv dXRNaWxlc3RvbmVzKCkgJiBEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCkgeworICAg ICAgICAvLyBUaGlzIG1haW4gYXJ0aWNsZSBlbGVtZW50IGhldXJpc3RpYyBpcyBjdXJyZW50bHkg b25seSB1c2VkIGZvciB0aGUgcHVycG9zZXMgb2YgZmlyaW5nIHRoZSBzaWduaWZpY2FudCByZW5k ZXJlZCB0ZXh0CisgICAgICAgIC8vIGxheW91dCBtaWxlc3RvbmUuIElmIHRoaXMgbGF5b3V0IG1p bGVzdG9uZSBoYXMgbm90IGJlZW4gcmVxdWVzdGVkLCB3ZSBkb24ndCBuZWVkIHRvIGJvdGhlciBr ZWVwaW5nIHRoZSBtYWluIGFydGljbGUKKyAgICAgICAgLy8gZWxlbWVudCB1cCB0byBkYXRlLgor ICAgICAgICBmcmFtZSgpLmRvY3VtZW50KCktPnVwZGF0ZU1haW5BcnRpY2xlRWxlbWVudEFmdGVy TGF5b3V0KCk7CisgICAgfQorCiAgICAgZnJhbWUoKS5zZWxlY3Rpb24oKS51cGRhdGVBcHBlYXJh bmNlQWZ0ZXJMYXlvdXQoKTsKIAogICAgIGZsdXNoUG9zdExheW91dFRhc2tzUXVldWUoKTsK 360193 2019-01-25 17:01:25 -0800 2019-01-25 19:39:03 -0800 Rebase on trunk bug-193843-20190125170125.patch text/plain 2712 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU0NzY1NWUzMWI5ZmU2 ZTM2MzUwZTIyYTBkNDZkZDQ5YmMxNDc2Zi4uNGYyYzM2ZWU0OTZiMTczMDAyMDFlNjNiM2VjZmQx ZDAwMmQxMjIxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTAxLTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIERvY3VtZW50Ojp1 cGRhdGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpIHNob3VsZCBiZSBhIG5vLW9wIHdo ZW4gbm8gY2xpZW50IGRlcGVuZHMgb24ga25vd2luZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0Rv Y3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVNYWluQXJ0aWNs ZUVsZW1lbnRBZnRlckxheW91dCk6CisKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBjdXJyZW50bHkg ZG9lcyBhIGJpdCBvZiB3YXN0ZWQgd29yayBhZnRlciBldmVyeSBsYXlvdXQsIG9uIGNsaWVudHMg dGhhdCBkb24ndCBsaXN0ZW4gdG8gdGhlCisgICAgICAgICJzaWduaWZpY2FudCByZW5kZXJlZCB0 ZXh0IiBsYXlvdXQgbWlsZXN0b25lIGFuZCB0aGVyZWZvcmUgZG9uJ3QgbmVlZCB0byBndWVzcyB0 aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQuIFNpbXBseQorICAgICAgICBkb24ndCBib3RoZXIga2Vl cGluZyB0aGUgbWFpbiBhcnRpY2xlIGVsZW1lbnQgdXAgdG8gZGF0ZSBpbiB0aGlzIHNjZW5hcmlv IGJ5IGJhaWxpbmcgZnJvbQorICAgICAgICBGcmFtZVZpZXc6OnVwZGF0ZUhhc1JlYWNoZWRTaWdu aWZpY2FudFJlbmRlcmVkVGV4dFRocmVzaG9sZCBpZiB0aGUgY2xpZW50IGRvZXNuJ3QgY2FyZSBh Ym91dCB0aGUgc2lnbmlmaWNhbnQKKyAgICAgICAgcmVuZGVyZWQgdGV4dCBtaWxlc3RvbmUuCisK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnVwZGF0ZUhhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRlcmVkVGV4dFRocmVzaG9sZCk6CisK IDIwMTktMDEtMjUgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFVwZGF0ZSBYY29kZSBwcm9qZWN0cyB3aXRoICJDaGVjayAueGNmaWxlbGlzdHMiIGJ1aWxkIHBo YXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA1ZGI3MWY1MTZmNmY4OGQ3NDIxMTQ5YjE5 NTI3ZjRlN2FkOGMxNzU5Li5hZDMzZmFmOWQxMjVkNzY3OWQ3MTQyYzI4NWE0OTkzZjQzNWNlMDZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTgzNzMsNiArODM3Myw4IEBAIHZvaWQgRG9j dW1lbnQ6OnVucmVnaXN0ZXJBcnRpY2xlRWxlbWVudChFbGVtZW50JiBhcnRpY2xlKQogCiB2b2lk IERvY3VtZW50Ojp1cGRhdGVNYWluQXJ0aWNsZUVsZW1lbnRBZnRlckxheW91dCgpCiB7CisgICAg QVNTRVJUKHBhZ2UoKSAmJiBwYWdlKCktPnJlcXVlc3RlZExheW91dE1pbGVzdG9uZXMoKS5jb250 YWlucyhEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCkpOworCiAgICAgLy8gSWYgdGhl cmUgYXJlIHRvbyBtYW55IGFydGljbGUgZWxlbWVudHMgb24gdGhlIHBhZ2UsIGRvbid0IGNvbnNp ZGVyIGFueSBvbmUgb2YgdGhlbSB0byBiZSAibWFpbiBjb250ZW50Ii4KICAgICBjb25zdCB1bnNp Z25lZCBtYXhOdW1iZXJPZkFydGljbGVzQmVmb3JlSWdub3JpbmdNYWluQ29udGVudEFydGljbGUg PSAxMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGM5M2IwNGViNmE5NDNiYzYy NDc0ZWE0ZmU1OWI1MmJkNTRlZDlhNWQuLjRhOGVmNTNiYjNiOWYzNmFhMDMwNTViNjMxY2I5Yjdh Njc3OWJjODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTQ0MTgsNiArNDQxOCwx MCBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlSGFzUmVhY2hlZFNpZ25pZmljYW50UmVuZGVyZWRU ZXh0VGhyZXNob2xkKCkKICAgICBpZiAobV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRl eHRUaHJlc2hvbGQpCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIHBhZ2UgPSBmcmFtZSgp LnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnJlcXVlc3RlZExheW91dE1pbGVzdG9u ZXMoKS5jb250YWlucyhEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCkpCisgICAgICAg IHJldHVybjsKKwogICAgIGF1dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgpOwogICAg IGlmICghZG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsK