208170 2020-02-24 17:16:08 -0800 Rename the clashing WebOverlayLayer classes 2020-02-28 06:28:54 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 208156 InRadar P2 Normal --- 1 simon.fraser simon.fraser eric.carlson ews-watchlist glenn jer.noble philipj sam sergio simon.fraser webkit-bug-importer oldest_to_newest 1622442 0 simon.fraser 2020-02-24 17:16:08 -0800 Rename the clashing WebOverlayLayer classes 1622443 1 391613 simon.fraser 2020-02-24 17:17:04 -0800 Created attachment 391613 Patch 1622444 2 simon.fraser 2020-02-24 17:17:07 -0800 <rdar://problem/59739250> 1622445 3 simon.fraser 2020-02-24 17:17:36 -0800 *** This bug has been marked as a duplicate of bug 208156 *** 391613 2020-02-24 17:17:04 -0800 2020-02-28 06:28:54 -0800 Patch bug-208170-20200224171704.patch text/plain 4692 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZkMzNlNjZhM2VkZGMy YzU1MDE0YzlhZTExMmIxYzBiNTc1NDkzYy4uNTI3YWM3MTNhNTU2N2VhMzZiNGJmMTA4YzM0ZTMy ODhlNzJiMzA3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAyLTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSB0aGUg Y2xhc2hpbmcgV2ViT3ZlcmxheUxheWVyIGNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODE3MAorICAgICAgICByZGFyOi8vcHJvYmxlbS81 OTczOTI1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBuYW1lIFdlYk92ZXJsYXlMYXllciB3YXMgdXNlZCBpbiB0d28gcGxhY2VzLiBSZW5hbWUg dGhlbSBib3RoIHRvIG1vcmUgc3BlY2lmaWMgbmFtZXMuCisKKyAgICAgICAgKiBwYWdlL2NvY29h L1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW06CisgICAgICAgICgtW1dlYlJlc291cmNlVXNh Z2VPdmVybGF5TGF5ZXIgaW5pdFdpdGhSZXNvdXJjZVVzYWdlT3ZlcmxheTpdKToKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybUluaXRpYWxpemUpOgorICAg ICAgICAoLVtXZWJPdmVybGF5TGF5ZXIgaW5pdFdpdGhSZXNvdXJjZVVzYWdlT3ZlcmxheTpdKTog RGVsZXRlZC4KKyAgICAgICAgKC1bV2ViT3ZlcmxheUxheWVyIGRyYXdJbkNvbnRleHQ6XSk6IERl bGV0ZWQuCisKIDIwMjAtMDItMjQgIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUu Y29tPgogCiAgICAgICAgIFtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciB1cGRhdGVPYmpl Y3RCYWNraW5nU3RvcmVdIHNob3VsZCByZXR1cm4gdGhlIGJhY2tpbmcgb2JqZWN0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IDhmNTA3YTQ5YjRjZjczODc4ZDMwY2YyNzJmNzQzZWNm ZmE3MmU2N2QuLmZiMDE0OTBjNjIxMDhlYzlkMjJkZGJhMmRkZjI5MzM1Mzc5MDZhMjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMC0wMi0yNCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgdGhl IGNsYXNoaW5nIFdlYk92ZXJsYXlMYXllciBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgxNzAKKyAgICAgICAgcmRhcjovL3Byb2JsZW0v NTk3MzkyNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgbmFtZSBXZWJPdmVybGF5TGF5ZXIgd2FzIHVzZWQgaW4gdHdvIHBsYWNlcy4gUmVuYW1l IHRoZW0gYm90aCB0byBtb3JlIHNwZWNpZmljIG5hbWVzLgorCisgICAgICAgICogV2ViVmlldy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxz Y3JlZW5Db250cm9sbGVyIGluaXRdKToKKyAgICAgICAgKC1bV2ViT3ZlcmxheUxheWVyIGxheW91 dFN1YmxheWVyc10pOiBEZWxldGVkLgorCiAyMDIwLTAyLTIyICBEYXJpbiBBZGxlciAgPGRhcmlu QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBpbmNsdWRlIG1pc3Rha2VzIGFuZCBtYWtl IHNvbWUgY29kaW5nIHN0eWxlIHR3ZWFrcyB0byBXZWJLaXQgYW5kIFdlYktpdFRlc3RSdW5uZXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZU92ZXJs YXlDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZU92ZXJs YXlDb2NvYS5tbQppbmRleCAxNTZlYjEwODM0ZDg4MjlkOWQ2NzlkNDQ2NDNkYzI1YWZkOWU5MDcz Li5mZTlhOGEzNjEwOTQ0YzVlMjM0YWQzMTE3NDJmODgwM2FiZmQ2NTA0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNhZ2VPdmVybGF5Q29jb2EubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1t CkBAIC00NCwxNCArNDQsMTUgQEAKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0 ZU51bWJlcnMuaD4KIAogdXNpbmcgV2ViQ29yZTo6UmVzb3VyY2VVc2FnZU92ZXJsYXk7Ci1AaW50 ZXJmYWNlIFdlYk92ZXJsYXlMYXllciA6IENBTGF5ZXIgeworCitAaW50ZXJmYWNlIFdlYlJlc291 cmNlVXNhZ2VPdmVybGF5TGF5ZXIgOiBDQUxheWVyIHsKICAgICBSZXNvdXJjZVVzYWdlT3Zlcmxh eSogbV9vdmVybGF5OwogfQogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gV2ViT3ZlcmxheUxheWVy CitAaW1wbGVtZW50YXRpb24gV2ViUmVzb3VyY2VVc2FnZU92ZXJsYXlMYXllcgogCi0tIChXZWJP dmVybGF5TGF5ZXIgKilpbml0V2l0aFJlc291cmNlVXNhZ2VPdmVybGF5OihSZXNvdXJjZVVzYWdl T3ZlcmxheSAqKW92ZXJsYXkKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aFJlc291cmNlVXNhZ2VP dmVybGF5OihSZXNvdXJjZVVzYWdlT3ZlcmxheSAqKW92ZXJsYXkKIHsKICAgICBzZWxmID0gW3N1 cGVyIGluaXRdOwogICAgIGlmICghc2VsZikKQEAgLTIxNiw3ICsyMTcsNyBAQCBzdGF0aWMgdm9p ZCBhcHBlbmREYXRhVG9IaXN0b3J5KGNvbnN0IFJlc291cmNlVXNhZ2VEYXRhJiBkYXRhKQogCiB2 b2lkIFJlc291cmNlVXNhZ2VPdmVybGF5OjpwbGF0Zm9ybUluaXRpYWxpemUoKQogewotICAgIG1f bGF5ZXIgPSBhZG9wdE5TKFtbV2ViT3ZlcmxheUxheWVyIGFsbG9jXSBpbml0V2l0aFJlc291cmNl VXNhZ2VPdmVybGF5OnRoaXNdKTsKKyAgICBtX2xheWVyID0gYWRvcHROUyhbW1dlYlJlc291cmNl VXNhZ2VPdmVybGF5TGF5ZXIgYWxsb2NdIGluaXRXaXRoUmVzb3VyY2VVc2FnZU92ZXJsYXk6dGhp c10pOwogCiAgICAgbV9jb250YWluZXJMYXllciA9IGFkb3B0TlMoW1tDQUxheWVyIGFsbG9jXSBp bml0XSk7CiAgICAgW21fY29udGFpbmVyTGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6bV9sYXllci5n ZXQoKV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KaW5kZXggM2I3ZTY4OWJjZWFhYmIx ODAyMzdjMTRjZDJiYjlmMTUzMGU3MWNhMi4uZTczNTYyN2NkYmViNDMxMGQ2Yjc3NTRiMTc1NzVh YTYzNjdjMGUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQpAQCAtNTEsMTAgKzUx LDEwIEBAIEBpbnRlcmZhY2UgQVZQbGF5ZXJWaWV3IChTZWNyZXRTdHVmZikKIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCBhc3NpZ24pIEJPT0wgc2hvd3NBdWRpb09ubHlJbmRpY2F0b3JWaWV3OwogQGVu ZAogCi1AaW50ZXJmYWNlIFdlYk92ZXJsYXlMYXllciA6IENBTGF5ZXIKK0BpbnRlcmZhY2UgV2Vi VmlkZW9GdWxsc2NyZWVuT3ZlcmxheUxheWVyIDogQ0FMYXllcgogQGVuZAogCi1AaW1wbGVtZW50 YXRpb24gV2ViT3ZlcmxheUxheWVyCitAaW1wbGVtZW50YXRpb24gV2ViVmlkZW9GdWxsc2NyZWVu T3ZlcmxheUxheWVyCiAtICh2b2lkKWxheW91dFN1YmxheWVycwogewogICAgIGZvciAoQ0FMYXll ciogbGF5ZXIgaW4gc2VsZi5zdWJsYXllcnMpCkBAIC0xNTIsNyArMTUyLDcgQEAgLSAoaWQpaW5p dAogICAgIF9wbGF5YmFja0ludGVyZmFjZSA9IFdlYkNvcmU6OlBsYXliYWNrU2Vzc2lvbkludGVy ZmFjZUFWS2l0OjpjcmVhdGUoKl9wbGF5YmFja01vZGVsKTsKICAgICBfY29udGVudE92ZXJsYXkg PSBhZG9wdE5TKFtbTlNWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TWmVyb1JlY3RdKTsKICAg ICBfY29udGVudE92ZXJsYXkuZ2V0KCkubGF5ZXJDb250ZW50c1JlZHJhd1BvbGljeSA9IE5TVmll d0xheWVyQ29udGVudHNSZWRyYXdOZXZlcjsKLSAgICBfY29udGVudE92ZXJsYXkuZ2V0KCkubGF5 ZXIgPSBbW1tXZWJPdmVybGF5TGF5ZXIgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICBf Y29udGVudE92ZXJsYXkuZ2V0KCkubGF5ZXIgPSBbW1tXZWJWaWRlb0Z1bGxzY3JlZW5PdmVybGF5 TGF5ZXIgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKICAgICBbX2NvbnRlbnRPdmVybGF5IHNl dFdhbnRzTGF5ZXI6WUVTXTsKICAgICBbX2NvbnRlbnRPdmVybGF5IHNldEF1dG9yZXNpemluZ01h c2s6KE5TVmlld1dpZHRoU2l6YWJsZSB8IE5TVmlld0hlaWdodFNpemFibGUpXTsKICAgICBbc2Vs ZiB3aW5kb3dEaWRMb2FkXTsK