191808 2018-11-17 11:07:13 -0800 Rename RenderLayerCompositor::inCompositingMode() to usesCompositing() 2018-11-17 16:53:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1479930 0 simon.fraser 2018-11-17 11:07:13 -0800 Rename RenderLayerCompositor::inCompositingMode() to usesCompositing() 1479931 1 355196 simon.fraser 2018-11-17 11:07:56 -0800 Created attachment 355196 Patch 1479932 2 355196 zalan 2018-11-17 11:44:42 -0800 Comment on attachment 355196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355196&action=review > Source/WebCore/page/FrameView.cpp:2412 > clearBackingStores(); I'd go even one step further and move clearBackingStore() into a lambda since no one else calls into it (it's public on FrameView!) and then you could even drop some lines from clearBackingStores (assert and the renderView() check) 1479998 3 simon.fraser 2018-11-17 16:52:09 -0800 https://trac.webkit.org/changeset/238352/webkit 1480002 4 webkit-bug-importer 2018-11-17 16:53:25 -0800 <rdar://problem/46152492> 355196 2018-11-17 11:07:56 -0800 2018-11-17 11:44:42 -0800 Patch bug-191808-20181117110755.patch text/plain 14729 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VkNTgzZDMxODM3ZTBh YjI1NTgzYjYyMzVhYWY1YzRiYzQwYzhjNS4uYTA5ODE0YTZjMjA4YWI0NWVhODVkMzg4MWE1M2Yz N2EzYWQ0ZmNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE4LTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmluQ29tcG9zaXRpbmdNb2RlKCkgdG8gdXNlc0NvbXBvc2l0aW5n KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTgw OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE90aGVy IGNvZGUgdXNlcyAidXNlc0NvbXBvc2l0aW5nIiBzbyBzdGFuZGFyZGl6ZSBvbiB0aGF0IChmdXR1 cmUgY2hhbmdlcyB3aWxsIG1ha2UKKyAgICAgICAgImNvbXBvc2l0aW5nIG1vZGUiIG1vcmUgYW1i aWd1b3VzKS4gQWxzbyByZW1vdmUgYSBGcmFtZVZpZXcgZnVuY3Rpb24gdGhhdCBvbmx5CisgICAg ICAgIGhhZCBvbmUgY2FsbGVyLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpjbGVhckJhY2tpbmdTdG9yZXMpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpoYW5kbGVEZWZlcnJlZFNjcm9sbGJhcnNVcGRhdGVBZnRlckRp cmVjdGlvbkNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmRlbGVnYXRlc1Nj cm9sbGluZ0RpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6Omhhc0NvbXBv c2l0ZWRDb250ZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6YWRkQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnJlbW92ZUNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZWJ1aWxkWk9y ZGVyTGlzdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9z aXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFRvKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Ny b2xsKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdQ b2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRl Q29tcG9zaXRpbmdSZXF1aXJlbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpsYXllclN0eWxlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpwYXJlbnRGcmFtZUNvbnRlbnRMYXllcnMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzZXRJc0luV2luZG93KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6bmVlZHNUb0JlQ29tcG9zaXRlZCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYXNvbnNGb3JDb21w b3NpdGluZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JBbmltYXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyb290T3JCb2R5U3R5bGVDaGFuZ2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xvck9y VHJhbnNwYXJlbmN5Q2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclZpZXc6OnJlcGFpbnRWaWV3QW5kQ29tcG9zaXRlZExheWVycyk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3Ojp1c2VzQ29tcG9zaXRpbmcgY29uc3QpOgorCiAy MDE4LTExLTE2ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBF bmFibGUgZXh0ZXJuYWwgcGxheWJhY2sgZm9yIHZpZGVvIGluIGVsZW1lbnQgZnVsbHNjcmVlbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAzOTExMGE2ZjQ3ZDVmY2Y0NWEyY2MxNjcy OGQ4MTdkYjU2OThhNzQ0Li5iZGQxMTI3NmY3MWU3YzYyM2Y1ZGIxNDRkZTdhZjA0ZDdjZmQxODYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC04NTcsNyArODU3LDcgQEAgdm9pZCBG cmFtZVZpZXc6OmNsZWFyQmFja2luZ1N0b3JlcygpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJl bmRlckxheWVyQ29tcG9zaXRvciYgY29tcG9zaXRvciA9IHJlbmRlclZpZXctPmNvbXBvc2l0b3Io KTsKLSAgICBBU1NFUlQoY29tcG9zaXRvci5pbkNvbXBvc2l0aW5nTW9kZSgpKTsKKyAgICBBU1NF UlQoY29tcG9zaXRvci51c2VzQ29tcG9zaXRpbmcoKSk7CiAgICAgY29tcG9zaXRvci5lbmFibGVD b21wb3NpdGluZ01vZGUoZmFsc2UpOwogICAgIGNvbXBvc2l0b3IuY2xlYXJCYWNraW5nRm9yQWxs TGF5ZXJzKCk7CiB9CkBAIC0xMTYwLDEzICsxMTYwLDYgQEAgdm9pZCBGcmFtZVZpZXc6OmhhbmRs ZURlZmVycmVkU2Nyb2xsYmFyc1VwZGF0ZUFmdGVyRGlyZWN0aW9uQ2hhbmdlKCkKICAgICB1cGRh dGVTY3JvbGxiYXJzKHNjcm9sbFBvc2l0aW9uKCkpOwogICAgIHBvc2l0aW9uU2Nyb2xsYmFyTGF5 ZXJzKCk7CiB9Ci0gICAgCi1ib29sIEZyYW1lVmlldzo6aGFzQ29tcG9zaXRlZENvbnRlbnQoKSBj b25zdAotewotICAgIGlmIChSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmll dygpKQotICAgICAgICByZXR1cm4gcmVuZGVyVmlldy0+Y29tcG9zaXRvcigpLmluQ29tcG9zaXRp bmdNb2RlKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQogCiAvLyBTb21ldGltZXMgKGZvciBwbHVn LWlucykgd2UgbmVlZCB0byBlYWdlcmx5IGdvIGludG8gY29tcG9zaXRpbmcgbW9kZS4KIHZvaWQg RnJhbWVWaWV3OjplbnRlckNvbXBvc2l0aW5nTW9kZSgpCkBAIC0yNDE1LDcgKzI0MDgsNyBAQCB2 b2lkIEZyYW1lVmlldzo6Y29udGVudHNSZXNpemVkKCkKIHZvaWQgRnJhbWVWaWV3OjpkZWxlZ2F0 ZXNTY3JvbGxpbmdEaWRDaGFuZ2UoKQogewogICAgIC8vIFdoZW4gd2Ugc3dpdGNoIHRvIGRlbGdh dGVzU2Nyb2xsaW5nIG1vZGUsIHdlIHNob3VsZCBkZXN0cm95IHRoZSBzY3JvbGxpbmcvY2xpcHBp bmcgbGF5ZXJzIGluIFJlbmRlckxheWVyQ29tcG9zaXRvci4KLSAgICBpZiAoaGFzQ29tcG9zaXRl ZENvbnRlbnQoKSkKKyAgICBpZiAocmVuZGVyVmlldygpICYmIHJlbmRlclZpZXcoKS0+Y29tcG9z aXRvcigpLnVzZXNDb21wb3NpdGluZygpKQogICAgICAgICBjbGVhckJhY2tpbmdTdG9yZXMoKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMzE3MzQ5OTE5Y2YyYjI2ZDg0YzU4Yjdi ZWU2ZjZkMGU3ZjY1NTliNy4uMGE0ZTA4YjAyYmY2ZjYzOWIyYzBiNDA5ZGIwMjQ3NzhkMDJmM2Ni NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0xNjAsNyArMTYwLDYgQEAgcHVibGljOgog ICAgIHVpbnQ2NF90IHNjcm9sbExheWVySUQoKSBjb25zdDsKICAgICBTY3JvbGxhYmxlQXJlYSog c2Nyb2xsYWJsZUFyZWFGb3JTY3JvbGxMYXllcklEKHVpbnQ2NF90KSBjb25zdDsKIAotICAgIGJv b2wgaGFzQ29tcG9zaXRlZENvbnRlbnQoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IGVudGVyQ29tcG9zaXRpbmdNb2RlKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0VuY2xv c2VkSW5Db21wb3NpdGluZ0xheWVyKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCmluZGV4IDc1NTExMWFkNDU2MTNmYWNkYTE1YTYxZjVkNGI2MGUzMzg5 ODkzZGQuLjczN2U3ZDg4NGFiYWM4NDQ2MTAwNTQwYTBlYzkwNTdkN2MzODI3ZDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNDA1LDcgKzQwNSw3IEBAIHZv aWQgUmVuZGVyTGF5ZXI6OmFkZENoaWxkKFJlbmRlckxheWVyJiBjaGlsZCwgUmVuZGVyTGF5ZXIq IGJlZm9yZUNoaWxkKQogICAgIGlmIChjaGlsZC5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwgY2hp bGQuaGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIHNldEFuY2VzdG9y Q2hhaW5IYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKTsKIAotICAgIGlmIChjb21wb3Np dG9yKCkuaW5Db21wb3NpdGluZ01vZGUoKSkKKyAgICBpZiAoY29tcG9zaXRvcigpLnVzZXNDb21w b3NpdGluZygpKQogICAgICAgICBzZXREZXNjZW5kYW50c05lZWRDb21wb3NpdGluZ1JlcXVpcmVt ZW50c1RyYXZlcnNhbCgpOwogCiAgICAgaWYgKGNoaWxkLmhhc0Rlc2NlbmRhbnROZWVkaW5nQ29t cG9zaXRpbmdSZXF1aXJlbWVudHNUcmF2ZXJzYWwoKSB8fCBjaGlsZC5uZWVkc0NvbXBvc2l0aW5n UmVxdWlyZW1lbnRzVHJhdmVyc2FsKCkpCkBAIC00NTEsNyArNDUxLDcgQEAgdm9pZCBSZW5kZXJM YXllcjo6cmVtb3ZlQ2hpbGQoUmVuZGVyTGF5ZXImIG9sZENoaWxkKQogICAgIGlmIChvbGRDaGls ZC5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwgb2xkQ2hpbGQuaGFzU2VsZlBhaW50aW5nTGF5ZXJE ZXNjZW5kYW50KCkpCiAgICAgICAgIGRpcnR5QW5jZXN0b3JDaGFpbkhhc1NlbGZQYWludGluZ0xh eWVyRGVzY2VuZGFudFN0YXR1cygpOwogCi0gICAgaWYgKGNvbXBvc2l0b3IoKS5pbkNvbXBvc2l0 aW5nTW9kZSgpKQorICAgIGlmIChjb21wb3NpdG9yKCkudXNlc0NvbXBvc2l0aW5nKCkpCiAgICAg ICAgIHNldERlc2NlbmRhbnRzTmVlZENvbXBvc2l0aW5nUmVxdWlyZW1lbnRzVHJhdmVyc2FsKCk7 CiAKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQpAQCAtNjk2LDcgKzY5Niw3IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnJlYnVpbGRaT3JkZXJMaXN0cygpCiAKIHZvaWQgUmVuZGVyTGF5ZXI6OnJl YnVpbGRaT3JkZXJMaXN0cyhzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPFJlbmRlckxheWVyKj4+JiBw b3NaT3JkZXJMaXN0LCBzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPFJlbmRlckxheWVyKj4+JiBuZWda T3JkZXJMaXN0KQogewotICAgIGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycyA9IGNvbXBvc2l0b3Io KS5pbkNvbXBvc2l0aW5nTW9kZSgpOworICAgIGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycyA9IGNv bXBvc2l0b3IoKS51c2VzQ29tcG9zaXRpbmcoKTsKICAgICBmb3IgKFJlbmRlckxheWVyKiBjaGls ZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsK ICAgICAgICAgaWYgKCFpc1JlZmxlY3Rpb25MYXllcigqY2hpbGQpKQogICAgICAgICAgICAgY2hp bGQtPmNvbGxlY3RMYXllcnMoaW5jbHVkZUhpZGRlbkxheWVycywgcG9zWk9yZGVyTGlzdCwgbmVn Wk9yZGVyTGlzdCk7CkBAIC0xNTc3LDcgKzE1NzcsNyBAQCBib29sIFJlbmRlckxheWVyOjp1cGRh dGVMYXllclBvc2l0aW9uKCkKICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCB8PSBsb2NhdGlv bigpICE9IGxvY2FsUG9pbnQ7CiAgICAgc2V0TG9jYXRpb24obG9jYWxQb2ludCk7CiAgICAgCi0g ICAgaWYgKHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkICYmIGNvbXBvc2l0b3IoKS5pbkNvbXBvc2l0 aW5nTW9kZSgpKSB7CisgICAgaWYgKHBvc2l0aW9uT3JPZmZzZXRDaGFuZ2VkICYmIGNvbXBvc2l0 b3IoKS51c2VzQ29tcG9zaXRpbmcoKSkgewogICAgICAgICBpZiAoaXNDb21wb3NpdGVkKCkpCiAg ICAgICAgICAgICBzZXROZWVkc0NvbXBvc2l0aW5nR2VvbWV0cnlVcGRhdGUoKTsKICAgICAgICAg Ly8gVGhpcyBsYXllcidzIHBvc2l0aW9uIGNhbiBhZmZlY3QgdGhlIGxvY2F0aW9uIG9mIGEgY29t cG9zaXRlZCBkZXNjZW5kYW50ICh3aGljaCBtYXkgYmUgYSBzaWJsaW5nIGluIHotb3JkZXIpLApA QCAtMjQzMCw3ICsyNDMwLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG8oY29uc3QgU2Ny b2xsUG9zaXRpb24mIHBvc2l0aW9uKQogICAgIGZyYW1lLmV2ZW50SGFuZGxlcigpLmRpc3BhdGNo RmFrZU1vdXNlTW92ZUV2ZW50U29vbkluUXVhZChxdWFkRm9yRmFrZU1vdXNlTW92ZUV2ZW50KTsK IAogICAgIGJvb2wgcmVxdWlyZXNSZXBhaW50ID0gdHJ1ZTsKLSAgICBpZiAoY29tcG9zaXRvcigp LmluQ29tcG9zaXRpbmdNb2RlKCkgJiYgdXNlc0NvbXBvc2l0ZWRTY3JvbGxpbmcoKSkgeworICAg IGlmIChjb21wb3NpdG9yKCkudXNlc0NvbXBvc2l0aW5nKCkgJiYgdXNlc0NvbXBvc2l0ZWRTY3Jv bGxpbmcoKSkgewogICAgICAgICBzZXROZWVkc0NvbXBvc2l0aW5nR2VvbWV0cnlVcGRhdGUoKTsK ICAgICAgICAgc2V0RGVzY2VuZGFudHNOZWVkVXBkYXRlQmFja2luZ0FuZEhpZXJhcmNoeVRyYXZl cnNhbCgpOwogICAgICAgICByZXF1aXJlc1JlcGFpbnQgPSBmYWxzZTsKQEAgLTI1ODAsNyArMjU4 MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0 UmVjdCYgYWJzb2x1dGVSZWN0LCBib29sIGluc2lkCiAKIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0 ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTY3JvbGwoKQogewotICAgIGlmIChjb21wb3NpdG9yKCku aW5Db21wb3NpdGluZ01vZGUoKSkgeworICAgIGlmIChjb21wb3NpdG9yKCkudXNlc0NvbXBvc2l0 aW5nKCkpIHsKICAgICAgICAgLy8gT3VyIHN0YWNraW5nIGNvbnRhaW5lciBpcyBndWFyYW50ZWVk IHRvIGNvbnRhaW4gYWxsIG9mIG91ciBkZXNjZW5kYW50cyB0aGF0IG1heSBuZWVkCiAgICAgICAg IC8vIHJlcG9zaXRpb25pbmcsIHNvIHVwZGF0ZSBjb21wb3NpdGluZyBsYXllcnMgZnJvbSB0aGVy ZS4KICAgICAgICAgaWYgKFJlbmRlckxheWVyKiBjb21wb3NpdGluZ0FuY2VzdG9yID0gc3RhY2tp bmdDb250ZXh0KCktPmVuY2xvc2luZ0NvbXBvc2l0aW5nTGF5ZXIoKSkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBjNTI0 NzljMmY2MjBiNTg1Mjg5MjZlM2VjOGU5NGY3NzhkMzZlNjAyLi40ZDg3ZmE4YzY4NGRmNzM2ZGYx ODY5OTBkNGVmY2U4ZTY3YzVjZDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzcwLDcgKzM3MCw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpjYWNoZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGbGFnc0FmdGVy TGF5b3V0KCkKIAogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5n UG9saWN5KCkKIHsKLSAgICBpZiAoIWluQ29tcG9zaXRpbmdNb2RlKCkpCisgICAgaWYgKCF1c2Vz Q29tcG9zaXRpbmcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byBjdXJyZW50 UG9saWN5ID0gbV9jb21wb3NpdGluZ1BvbGljeTsKQEAgLTg5Nyw3ICs4OTcsNyBAQCB2b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRl ckxheWVyKiBhbmNlc3RvcgogCiAgICAgLy8gSWYgd2UganVzdCBlbnRlcmVkIGNvbXBvc2l0aW5n IG1vZGUsIHRoZSByb290IHdpbGwgaGF2ZSBiZWNvbWUgY29tcG9zaXRlZCAoYXMgbG9uZyBhcyBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkKS4KICAgICBpZiAobGF5ZXIuaXNSZW5k ZXJWaWV3TGF5ZXIoKSkgewotICAgICAgICBpZiAoaW5Db21wb3NpdGluZ01vZGUoKSAmJiBtX2hh c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcpCisgICAgICAgIGlmICh1c2VzQ29tcG9zaXRpbmcoKSAm JiBtX2hhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcpCiAgICAgICAgICAgICB3aWxsQmVDb21wb3Np dGVkID0gdHJ1ZTsKICAgICB9CiAgICAgCkBAIC0xMzYyLDcgKzEzNjIsNyBAQCB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6bGF5ZXJTdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlIGRpZmYs IFJlbmRlckxheWVyJgogICAgIGlmIChxdWVyeURhdGEucmVldmFsdWF0ZUFmdGVyTGF5b3V0KQog ICAgICAgICBsYXllci5zZXROZWVkc1Bvc3RMYXlvdXRDb21wb3NpdGluZ1VwZGF0ZSgpOwogCi0g ICAgaWYgKGRpZmYgPj0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXRQb3NpdGlvbmVkTW92ZW1lbnRP bmx5ICYmIGluQ29tcG9zaXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoZGlmZiA+PSBTdHlsZURpZmZl cmVuY2U6OkxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHkgJiYgdXNlc0NvbXBvc2l0aW5nKCkp IHsKICAgICAgICAgbGF5ZXIuc2V0TmVlZHNQb3N0TGF5b3V0Q29tcG9zaXRpbmdVcGRhdGUoKTsK ICAgICAgICAgbGF5ZXIuc2V0TmVlZHNDb21wb3NpdGluZ0dlb21ldHJ5VXBkYXRlKCk7CiAgICAg fQpAQCAtMTU1NCw3ICsxNTU0LDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZUJhY2tpbmcoUmVuZGVyTGF5ZXImIGxheWVyLCBSZXF1aXJlc0NvbXBvc2l0aW4KIAogICAgIGlm IChsYXllckNoYW5nZWQgJiYgaXM8UmVuZGVyV2lkZ2V0PihsYXllci5yZW5kZXJlcigpKSkgewog ICAgICAgICBhdXRvKiBpbm5lckNvbXBvc2l0b3IgPSBmcmFtZUNvbnRlbnRzQ29tcG9zaXRvcigm ZG93bmNhc3Q8UmVuZGVyV2lkZ2V0PihsYXllci5yZW5kZXJlcigpKSk7Ci0gICAgICAgIGlmIChp bm5lckNvbXBvc2l0b3IgJiYgaW5uZXJDb21wb3NpdG9yLT5pbkNvbXBvc2l0aW5nTW9kZSgpKQor ICAgICAgICBpZiAoaW5uZXJDb21wb3NpdG9yICYmIGlubmVyQ29tcG9zaXRvci0+dXNlc0NvbXBv c2l0aW5nKCkpCiAgICAgICAgICAgICBpbm5lckNvbXBvc2l0b3ItPnVwZGF0ZVJvb3RMYXllckF0 dGFjaG1lbnQoKTsKICAgICB9CiAgICAgCkBAIC0xOTMxLDcgKzE5MzEsNyBAQCBSZW5kZXJMYXll ckNvbXBvc2l0b3IqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVDb250ZW50c0NvbXBvc2l0 b3IoUmVuZGVyV2lkZwogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnBhcmVudEZyYW1lQ29u dGVudExheWVycyhSZW5kZXJXaWRnZXQqIHJlbmRlcmVyKQogewogICAgIGF1dG8qIGlubmVyQ29t cG9zaXRvciA9IGZyYW1lQ29udGVudHNDb21wb3NpdG9yKHJlbmRlcmVyKTsKLSAgICBpZiAoIWlu bmVyQ29tcG9zaXRvciB8fCAhaW5uZXJDb21wb3NpdG9yLT5pbkNvbXBvc2l0aW5nTW9kZSgpIHx8 IGlubmVyQ29tcG9zaXRvci0+cm9vdExheWVyQXR0YWNobWVudCgpICE9IFJvb3RMYXllckF0dGFj aGVkVmlhRW5jbG9zaW5nRnJhbWUpCisgICAgaWYgKCFpbm5lckNvbXBvc2l0b3IgfHwgIWlubmVy Q29tcG9zaXRvci0+dXNlc0NvbXBvc2l0aW5nKCkgfHwgaW5uZXJDb21wb3NpdG9yLT5yb290TGF5 ZXJBdHRhY2htZW50KCkgIT0gUm9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIGF1dG8qIGxheWVyID0gcmVuZGVyZXItPmxh eWVyKCk7CkBAIC0xOTkyLDcgKzE5OTIsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 c2V0SXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiB7CiAgICAgTE9HKENvbXBvc2l0aW5nLCAi UmVuZGVyTGF5ZXJDb21wb3NpdG9yICVwIHNldElzSW5XaW5kb3cgJWQiLCB0aGlzLCBpc0luV2lu ZG93KTsKIAotICAgIGlmICghaW5Db21wb3NpdGluZ01vZGUoKSkKKyAgICBpZiAoIXVzZXNDb21w b3NpdGluZygpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoYXV0byogcm9vdExheWVyID0g cm9vdEdyYXBoaWNzTGF5ZXIoKSkgewpAQCAtMjA3NCw3ICsyMDc0LDcgQEAgYm9vbCBSZW5kZXJM YXllckNvbXBvc2l0b3I6Om5lZWRzVG9CZUNvbXBvc2l0ZWQoY29uc3QgUmVuZGVyTGF5ZXImIGxh eWVyLCBSZXF1aXIKICAgICBpZiAoIWNhbkJlQ29tcG9zaXRlZChsYXllcikpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIHJldHVybiByZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIs IHF1ZXJ5RGF0YSkgfHwgbGF5ZXIubXVzdENvbXBvc2l0ZUZvckluZGlyZWN0UmVhc29ucygpIHx8 IChpbkNvbXBvc2l0aW5nTW9kZSgpICYmIGxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkpOworICAg IHJldHVybiByZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIsIHF1ZXJ5RGF0YSkgfHwgbGF5 ZXIubXVzdENvbXBvc2l0ZUZvckluZGlyZWN0UmVhc29ucygpIHx8ICh1c2VzQ29tcG9zaXRpbmco KSAmJiBsYXllci5pc1JlbmRlclZpZXdMYXllcigpKTsKIH0KIAogLy8gTm90ZTogdGhpcyBzcGVj aWZpZXMgd2hldGhlciB0aGUgUkwgbmVlZHMgYSBjb21wb3NpdGluZyBsYXllciBmb3IgaW50cmlu c2ljIHJlYXNvbnMuCkBAIC0yMjcxLDcgKzIyNzEsNyBAQCBPcHRpb25TZXQ8Q29tcG9zaXRpbmdS ZWFzb24+IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVhc29uc0ZvckNvbXBvc2l0aW5nKGNvbnN0 CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGlmIChpbkNvbXBvc2l0aW5nTW9kZSgpICYm IHJlbmRlcmVyLmxheWVyKCktPmlzUmVuZGVyVmlld0xheWVyKCkpCisgICAgaWYgKHVzZXNDb21w b3NpdGluZygpICYmIHJlbmRlcmVyLmxheWVyKCktPmlzUmVuZGVyVmlld0xheWVyKCkpCiAgICAg ICAgIHJlYXNvbnMuYWRkKENvbXBvc2l0aW5nUmVhc29uOjpSb290KTsKIAogICAgIHJldHVybiBy ZWFzb25zOwpAQCAtMjQzMSw3ICsyNDMxLDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnJlcXVpcmVzQ29tcG9zaXRpbmdGb3JBbmltYXRpb24oUmVuZGVyTGF5ZXJNb2RlbE9iamUKICAg ICBjb25zdCBBbmltYXRpb25CYXNlOjpSdW5uaW5nU3RhdGUgYWN0aXZlQW5pbWF0aW9uU3RhdGUg PSBBbmltYXRpb25CYXNlOjpSdW5uaW5nIHwgQW5pbWF0aW9uQmFzZTo6UGF1c2VkOwogICAgIGF1 dG8mIGFuaW1Db250cm9sbGVyID0gcmVuZGVyZXIuYW5pbWF0aW9uKCk7CiAgICAgcmV0dXJuIChh bmltQ29udHJvbGxlci5pc1J1bm5pbmdBbmltYXRpb25PblJlbmRlcmVyKHJlbmRlcmVyLCBDU1NQ cm9wZXJ0eU9wYWNpdHksIGFjdGl2ZUFuaW1hdGlvblN0YXRlKQotICAgICAgICAmJiAoaW5Db21w b3NpdGluZ01vZGUoKSB8fCAobV9jb21wb3NpdGluZ1RyaWdnZXJzICYgQ2hyb21lQ2xpZW50OjpB bmltYXRlZE9wYWNpdHlUcmlnZ2VyKSkpCisgICAgICAgICYmICh1c2VzQ29tcG9zaXRpbmcoKSB8 fCAobV9jb21wb3NpdGluZ1RyaWdnZXJzICYgQ2hyb21lQ2xpZW50OjpBbmltYXRlZE9wYWNpdHlU cmlnZ2VyKSkpCiAgICAgICAgIHx8IGFuaW1Db250cm9sbGVyLmlzUnVubmluZ0FuaW1hdGlvbk9u UmVuZGVyZXIocmVuZGVyZXIsIENTU1Byb3BlcnR5RmlsdGVyLCBhY3RpdmVBbmltYXRpb25TdGF0 ZSkKICNpZiBFTkFCTEUoRklMVEVSU19MRVZFTF8yKQogICAgICAgICB8fCBhbmltQ29udHJvbGxl ci5pc1J1bm5pbmdBbmltYXRpb25PblJlbmRlcmVyKHJlbmRlcmVyLCBDU1NQcm9wZXJ0eVdlYmtp dEJhY2tkcm9wRmlsdGVyLCBhY3RpdmVBbmltYXRpb25TdGF0ZSkKQEAgLTMyMTQsNyArMzIxNCw3 IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp2aWV3SGFzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKENvbG9yKiBiYWNrZ3JvdW5kQ29sb3IpCiAvLyBiZSBvbiB0aGUgYm9keSB3aGljaCBoYXMg bm8gUmVuZGVyTGF5ZXIuCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdE9yQm9keVN0 eWxlQ2hhbmdlZChSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUqIG9s ZFN0eWxlKQogewotICAgIGlmICghaW5Db21wb3NpdGluZ01vZGUoKSkKKyAgICBpZiAoIXVzZXND b21wb3NpdGluZygpKQogICAgICAgICByZXR1cm47CiAKICAgICBDb2xvciBvbGRCYWNrZ3JvdW5k Q29sb3I7CkBAIC0zMjMxLDcgKzMyMzEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 cm9vdE9yQm9keVN0eWxlQ2hhbmdlZChSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29ucwogCiB2 b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xvck9yVHJhbnNwYXJl bmN5Q2hhbmdlZCgpCiB7Ci0gICAgaWYgKCFpbkNvbXBvc2l0aW5nTW9kZSgpKQorICAgIGlmICgh dXNlc0NvbXBvc2l0aW5nKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIENvbG9yIGJhY2tncm91 bmRDb2xvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaAppbmRleCA1N2UzNzM3YTdlNzM0YjRmNmNkYjU1YzZjMjc4ODBiZWEyYWMxM2IwLi42 NzM0ZTVhNWJhZjhlZWViODFlZmE3ODI4MWVkNmJlMjlkMzExODBmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC05OCw3ICs5OCw3 IEBAIHB1YmxpYzoKIAogICAgIC8vIFJldHVybiB0cnVlIGlmIHRoaXMgUmVuZGVyVmlldyBpcyBp biAiY29tcG9zaXRpbmcgbW9kZSIgKGkuZS4gaGFzIG9uZSBvciBtb3JlCiAgICAgLy8gY29tcG9z aXRlZCBSZW5kZXJMYXllcnMpCi0gICAgYm9vbCBpbkNvbXBvc2l0aW5nTW9kZSgpIGNvbnN0IHsg cmV0dXJuIG1fY29tcG9zaXRpbmc7IH0KKyAgICBib29sIHVzZXNDb21wb3NpdGluZygpIGNvbnN0 IHsgcmV0dXJuIG1fY29tcG9zaXRpbmc7IH0KICAgICAvLyBUaGlzIHdpbGwgbWFrZSBhIGNvbXBv c2l0aW5nIGxheWVyIGF0IHRoZSByb290IGF1dG9tYXRpY2FsbHksIGFuZCBob29rIHVwIHRvCiAg ICAgLy8gdGhlIG5hdGl2ZSB2aWV3L3dpbmRvdyBzeXN0ZW0uCiAgICAgdm9pZCBlbmFibGVDb21w b3NpdGluZ01vZGUoYm9vbCBlbmFibGUgPSB0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJWaWV3LmNwcAppbmRleCA2ZjY4ZGE4ZDU5YzEzY2NiMzllNzFmZjgyOGUwMGQ0MzE0NDkw NTExLi45MzU3Y2JjZTlmNGU5YjkxZmYxN2ExMDVjNGM4NDllYTE3ZGY2N2UyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC01NjUsNyArNTY1LDcgQEAgdm9pZCBS ZW5kZXJWaWV3OjpyZXBhaW50Vmlld0FuZENvbXBvc2l0ZWRMYXllcnMoKQogICAgIHJlcGFpbnRS b290Q29udGVudHMoKTsKIAogICAgIFJlbmRlckxheWVyQ29tcG9zaXRvciYgY29tcG9zaXRvciA9 IHRoaXMtPmNvbXBvc2l0b3IoKTsKLSAgICBpZiAoY29tcG9zaXRvci5pbkNvbXBvc2l0aW5nTW9k ZSgpKQorICAgIGlmIChjb21wb3NpdG9yLnVzZXNDb21wb3NpdGluZygpKQogICAgICAgICBjb21w b3NpdG9yLnJlcGFpbnRDb21wb3NpdGVkTGF5ZXJzKCk7CiB9CiAKQEAgLTc3Myw3ICs3NzMsNyBA QCB2b2lkIFJlbmRlclZpZXc6OnNldEJlc3RUcnVuY2F0ZWRBdChpbnQgeSwgUmVuZGVyQm94TW9k ZWxPYmplY3QqIGZvclJlbmRlcmVyLCBibwogCiBib29sIFJlbmRlclZpZXc6OnVzZXNDb21wb3Np dGluZygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fY29tcG9zaXRvciAmJiBtX2NvbXBvc2l0b3It PmluQ29tcG9zaXRpbmdNb2RlKCk7CisgICAgcmV0dXJuIG1fY29tcG9zaXRvciAmJiBtX2NvbXBv c2l0b3ItPnVzZXNDb21wb3NpdGluZygpOwogfQogCiBSZW5kZXJMYXllckNvbXBvc2l0b3ImIFJl bmRlclZpZXc6OmNvbXBvc2l0b3IoKQo=