219834 2020-12-13 08:39:25 -0800 Move createAppHighlightRangeData into AppHighlightStorage source file 2020-12-13 09:56:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead hi megan_gardner webkit-bug-importer wenson_hsieh oldest_to_newest 1714316 0 don.olmstead 2020-12-13 08:39:25 -0800 The createAppHighlightRangeData function was defined statically within AppHighlightListData.cpp but used in AppHighlightStorage.cpp. This breaks non-unified builds. 1714319 1 416118 don.olmstead 2020-12-13 08:54:50 -0800 Created attachment 416118 Patch 1714329 2 416118 hi 2020-12-13 09:47:38 -0800 Comment on attachment 416118 Patch rs=me 1714330 3 ews-feeder 2020-12-13 09:55:34 -0800 Committed r270750: <https://trac.webkit.org/changeset/270750> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416118. 1714331 4 webkit-bug-importer 2020-12-13 09:56:20 -0800 <rdar://problem/72271062> 416118 2020-12-13 08:54:50 -0800 2020-12-13 09:55:35 -0800 Patch bug-219834.diff text/plain 6335 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZTU3NDQ3NTlhZDAuLmMxODM1NjgyZDliMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMxIEBACisyMDIwLTEyLTEzICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CisKKyAgICAgICAgTW92ZSBjcmVhdGVBcHBIaWdobGlnaHRSYW5nZURhdGEgaW50byBB cHBIaWdobGlnaHRTdG9yYWdlIHNvdXJjZSBmaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3JlYXRlQXBwSGlnaGxpZ2h0UmFuZ2VEYXRhIGZ1 bmN0aW9uIHdhcyBkZWZpbmVkIHN0YXRpY2FsbHkgaW4gQXBwSGlnaGxpZ2h0TGlzdERhdGEuY3Bw CisgICAgICAgIGJ1dCB3YXMgb25seSB1c2VkIGluIEFwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwLiBN b3ZlZCB0aGUgc3RhdGljIGZ1bmN0aW9ucyBmcm9tIHRoZSBmb3JtZXIKKyAgICAgICAgaW50byB0 aGUgbGF0ZXIuCisKKyAgICAgICAgQWRkaXRpb25hbGx5IGFkZGVkIGZvcndhcmQgZGVjbGFyYXRp b25zIGluIHRoZSBBcHBIaWdobGlnaHRTdG9yYWdlIGhlYWRlci4KKworICAgICAgICBUaGlzIGFs bG93cyB0aGUgaGlnaGxpZ2h0IG1vZHVsZSB0byBjb21waWxlIHdpdGggbm9uLXVuaWZpZWQgc291 cmNlcy4KKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodExpc3REYXRh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVQYXRoSW5kZXgpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6Y3JlYXRlTm9kZVBhdGhDb21wb25lbnQpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6bWFrZU5vZGVQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZUFwcEhpZ2xpZ2h0UmFuZ2VEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL2hp Z2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1 dGVQYXRoSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlTm9kZVBhdGhDb21wb25lbnQp OgorICAgICAgICAoV2ViQ29yZTo6bWFrZU5vZGVQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZUFwcEhpZ2hsaWdodFJhbmdlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBIaWdobGln aHRTdG9yYWdlOjpjcmVhdGVBcHBIaWdobGlnaHRMaXN0RGF0YSk6CisgICAgICAgICogTW9kdWxl cy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorCiAyMDIwLTEyLTEzICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzb21lIG1pc3Np bmcgR3JpZCBmaWxlcyB0byB0aGUgcHJvamVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0TGlzdERhdGEuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0TGlzdERhdGEuY3BwCmluZGV4IDIwMmQ4 NjU5MzdlOS4uNDI3MmVlNmQzMzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2hpZ2hsaWdodC9BcHBIaWdobGlnaHRMaXN0RGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0TGlzdERhdGEuY3BwCkBAIC0zOSw0OCArMzks NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyB1bnNpZ25lZCBjb21wdXRlUGF0 aEluZGV4KGNvbnN0IE5vZGUmIG5vZGUpCi17Ci0gICAgU3RyaW5nIG5vZGVOYW1lID0gbm9kZS5u b2RlTmFtZSgpOwotICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKLSAgICBmb3IgKGF1dG8qIHByZXZp b3VzU2libGluZyA9IG5vZGUucHJldmlvdXNTaWJsaW5nKCk7IHByZXZpb3VzU2libGluZzsgcHJl dmlvdXNTaWJsaW5nID0gcHJldmlvdXNTaWJsaW5nLT5wcmV2aW91c1NpYmxpbmcoKSkgewotICAg ICAgICBpZiAocHJldmlvdXNTaWJsaW5nLT5ub2RlTmFtZSgpID09IG5vZGVOYW1lKQotICAgICAg ICAgICAgaW5kZXgrKzsKLSAgICB9Ci0gICAgcmV0dXJuIGluZGV4OwotfQotCi1zdGF0aWMgQXBw SGlnaGxpZ2h0UmFuZ2VEYXRhOjpOb2RlUGF0aENvbXBvbmVudCBjcmVhdGVOb2RlUGF0aENvbXBv bmVudChjb25zdCBOb2RlJiBub2RlKQotewotICAgIHJldHVybiB7Ci0gICAgICAgIGlzPEVsZW1l bnQ+KG5vZGUpID8gZG93bmNhc3Q8RWxlbWVudD4obm9kZSkuZ2V0SWRBdHRyaWJ1dGUoKS5zdHJp bmcoKSA6IG51bGxTdHJpbmcoKSwKLSAgICAgICAgbm9kZS5ub2RlTmFtZSgpLAotICAgICAgICBp czxDaGFyYWN0ZXJEYXRhPihub2RlKSA/IGRvd25jYXN0PENoYXJhY3RlckRhdGE+KG5vZGUpLmRh dGEoKSA6IG51bGxTdHJpbmcoKSwKLSAgICAgICAgY29tcHV0ZVBhdGhJbmRleChub2RlKQotICAg IH07Ci19Ci0KLXN0YXRpYyBBcHBIaWdobGlnaHRSYW5nZURhdGE6Ok5vZGVQYXRoIG1ha2VOb2Rl UGF0aChSZWZQdHI8Tm9kZT4mJiBub2RlKQotewotICAgIEFwcEhpZ2hsaWdodFJhbmdlRGF0YTo6 Tm9kZVBhdGggY29tcG9uZW50czsKLSAgICBhdXRvIGJvZHkgPSBub2RlLT5kb2N1bWVudCgpLmJv ZHkoKTsKLSAgICBmb3IgKGF1dG8gYW5jZXN0b3IgPSBub2RlOyBhbmNlc3RvciAmJiBhbmNlc3Rv ciAhPSBib2R5OyBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnROb2RlKCkpCi0gICAgICAgIGNv bXBvbmVudHMuYXBwZW5kKGNyZWF0ZU5vZGVQYXRoQ29tcG9uZW50KCphbmNlc3RvcikpOwotICAg IGNvbXBvbmVudHMucmV2ZXJzZSgpOwotICAgIHJldHVybiB7IGNvbXBvbmVudHMgfTsKLX0KLQot c3RhdGljIEFwcEhpZ2hsaWdodFJhbmdlRGF0YSBjcmVhdGVBcHBIaWdsaWdodFJhbmdlRGF0YShj b25zdCBTdGF0aWNSYW5nZSYgcmFuZ2UpCi17Ci0gICAgcmV0dXJuIHsKLSAgICAgICAgcGxhaW5U ZXh0KHJhbmdlKSwKLSAgICAgICAgbWFrZU5vZGVQYXRoKCZyYW5nZS5zdGFydENvbnRhaW5lcigp KSwKLSAgICAgICAgcmFuZ2Uuc3RhcnRPZmZzZXQoKSwKLSAgICAgICAgbWFrZU5vZGVQYXRoKCZy YW5nZS5lbmRDb250YWluZXIoKSksCi0gICAgICAgIHJhbmdlLmVuZE9mZnNldCgpCi0gICAgfTsK LX0KLQogQXBwSGlnaGxpZ2h0TGlzdERhdGEgQXBwSGlnaGxpZ2h0TGlzdERhdGE6OmNyZWF0ZShj b25zdCBTaGFyZWRCdWZmZXImIGJ1ZmZlcikKIHsKICAgICBhdXRvIGRlY29kZXIgPSBidWZmZXIu ZGVjb2RlcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQv QXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdo dC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcAppbmRleCAyOTUxZWRjMGEzODQuLmJkOTQ2YzgyNmQy NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxp Z2h0U3RvcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBw SGlnaGxpZ2h0U3RvcmFnZS5jcHAKQEAgLTE2MCw2ICsxNjAsNDggQEAgc3RhdGljIE9wdGlvbmFs PFNpbXBsZVJhbmdlPiBmaW5kUmFuZ2UoY29uc3QgQXBwSGlnaGxpZ2h0UmFuZ2VEYXRhJiByYW5n ZSwgRG9jdW0KICAgICByZXR1cm4gZmluZFJhbmdlQnlTZWFyY2hpbmdUZXh0KHJhbmdlLCBkb2N1 bWVudCk7CiB9CiAKK3N0YXRpYyB1bnNpZ25lZCBjb21wdXRlUGF0aEluZGV4KGNvbnN0IE5vZGUm IG5vZGUpCit7CisgICAgU3RyaW5nIG5vZGVOYW1lID0gbm9kZS5ub2RlTmFtZSgpOworICAgIHVu c2lnbmVkIGluZGV4ID0gMDsKKyAgICBmb3IgKGF1dG8qIHByZXZpb3VzU2libGluZyA9IG5vZGUu cHJldmlvdXNTaWJsaW5nKCk7IHByZXZpb3VzU2libGluZzsgcHJldmlvdXNTaWJsaW5nID0gcHJl dmlvdXNTaWJsaW5nLT5wcmV2aW91c1NpYmxpbmcoKSkgeworICAgICAgICBpZiAocHJldmlvdXNT aWJsaW5nLT5ub2RlTmFtZSgpID09IG5vZGVOYW1lKQorICAgICAgICAgICAgaW5kZXgrKzsKKyAg ICB9CisgICAgcmV0dXJuIGluZGV4OworfQorCitzdGF0aWMgQXBwSGlnaGxpZ2h0UmFuZ2VEYXRh OjpOb2RlUGF0aENvbXBvbmVudCBjcmVhdGVOb2RlUGF0aENvbXBvbmVudChjb25zdCBOb2RlJiBu b2RlKQoreworICAgIHJldHVybiB7CisgICAgICAgIGlzPEVsZW1lbnQ+KG5vZGUpID8gZG93bmNh c3Q8RWxlbWVudD4obm9kZSkuZ2V0SWRBdHRyaWJ1dGUoKS5zdHJpbmcoKSA6IG51bGxTdHJpbmco KSwKKyAgICAgICAgbm9kZS5ub2RlTmFtZSgpLAorICAgICAgICBpczxDaGFyYWN0ZXJEYXRhPihu b2RlKSA/IGRvd25jYXN0PENoYXJhY3RlckRhdGE+KG5vZGUpLmRhdGEoKSA6IG51bGxTdHJpbmco KSwKKyAgICAgICAgY29tcHV0ZVBhdGhJbmRleChub2RlKQorICAgIH07Cit9CisKK3N0YXRpYyBB cHBIaWdobGlnaHRSYW5nZURhdGE6Ok5vZGVQYXRoIG1ha2VOb2RlUGF0aChSZWZQdHI8Tm9kZT4m JiBub2RlKQoreworICAgIEFwcEhpZ2hsaWdodFJhbmdlRGF0YTo6Tm9kZVBhdGggY29tcG9uZW50 czsKKyAgICBhdXRvIGJvZHkgPSBub2RlLT5kb2N1bWVudCgpLmJvZHkoKTsKKyAgICBmb3IgKGF1 dG8gYW5jZXN0b3IgPSBub2RlOyBhbmNlc3RvciAmJiBhbmNlc3RvciAhPSBib2R5OyBhbmNlc3Rv ciA9IGFuY2VzdG9yLT5wYXJlbnROb2RlKCkpCisgICAgICAgIGNvbXBvbmVudHMuYXBwZW5kKGNy ZWF0ZU5vZGVQYXRoQ29tcG9uZW50KCphbmNlc3RvcikpOworICAgIGNvbXBvbmVudHMucmV2ZXJz ZSgpOworICAgIHJldHVybiB7IGNvbXBvbmVudHMgfTsKK30KKworc3RhdGljIEFwcEhpZ2hsaWdo dFJhbmdlRGF0YSBjcmVhdGVBcHBIaWdobGlnaHRSYW5nZURhdGEoY29uc3QgU3RhdGljUmFuZ2Um IHJhbmdlKQoreworICAgIHJldHVybiB7CisgICAgICAgIHBsYWluVGV4dChyYW5nZSksCisgICAg ICAgIG1ha2VOb2RlUGF0aCgmcmFuZ2Uuc3RhcnRDb250YWluZXIoKSksCisgICAgICAgIHJhbmdl LnN0YXJ0T2Zmc2V0KCksCisgICAgICAgIG1ha2VOb2RlUGF0aCgmcmFuZ2UuZW5kQ29udGFpbmVy KCkpLAorICAgICAgICByYW5nZS5lbmRPZmZzZXQoKQorICAgIH07Cit9CisKIEFwcEhpZ2hsaWdo dFN0b3JhZ2U6OkFwcEhpZ2hsaWdodFN0b3JhZ2UoRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDog bV9kb2N1bWVudChtYWtlV2Vha1B0cihkb2N1bWVudCkpCiB7CkBAIC0xNzUsNyArMjE3LDcgQEAg QXBwSGlnaGxpZ2h0TGlzdERhdGEgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6Y3JlYXRlQXBwSGlnaGxp Z2h0TGlzdERhdGEoKQogICAgIGlmIChhdXRvIGFwcEhpZ2hsaWdodFJlZ2lzdGVyID0gbV9kb2N1 bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpKSB7CiAgICAgICAgIGZvciAoYXV0 byYgaGlnaGxpZ2h0IDogYXBwSGlnaGxpZ2h0UmVnaXN0ZXItPm1hcCgpKSB7CiAgICAgICAgICAg ICBmb3IgKGF1dG8mIHJhbmdlRGF0YSA6IGhpZ2hsaWdodC52YWx1ZS0+cmFuZ2VzRGF0YSgpKQot ICAgICAgICAgICAgICAgIGRhdGEuYXBwZW5kKGNyZWF0ZUFwcEhpZ2xpZ2h0UmFuZ2VEYXRhKHJh bmdlRGF0YS0+cmFuZ2UpKTsKKyAgICAgICAgICAgICAgICBkYXRhLmFwcGVuZChjcmVhdGVBcHBI aWdobGlnaHRSYW5nZURhdGEocmFuZ2VEYXRhLT5yYW5nZSkpOwogICAgICAgICB9CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln aHRTdG9yYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln aHRTdG9yYWdlLmgKaW5kZXggMjlhYzgwODdmNDFkLi45MTVlOWFhNGRhNWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdl LmgKQEAgLTM1LDYgKzM1LDkgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQXBwSGln aGxpZ2h0TGlzdERhdGE7CitjbGFzcyBBcHBIaWdobGlnaHRSYW5nZURhdGE7CitjbGFzcyBEb2N1 bWVudDsKK2NsYXNzIFNoYXJlZEJ1ZmZlcjsKIAogY2xhc3MgQXBwSGlnaGxpZ2h0U3RvcmFnZSA6 IFJlZkNvdW50ZWQ8QXBwSGlnaGxpZ2h0U3RvcmFnZT4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOwo=