178044 2017-10-06 22:25:51 -0700 WebContentReader::readHTML should be shared between macOS and iOS 2017-10-07 00:05:13 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa commit-queue webkit-bug-importer wenson_hsieh oldest_to_newest 1357882 0 rniwa 2017-10-06 22:25:51 -0700 We can share the code for WebContentReader::readHTML between macOS and iOS. 1357883 1 323085 rniwa 2017-10-06 22:28:05 -0700 Created attachment 323085 Cleanup 1357896 2 323085 commit-queue 2017-10-07 00:04:10 -0700 Comment on attachment 323085 Cleanup Clearing flags on attachment: 323085 Committed r223020: <http://trac.webkit.org/changeset/223020> 1357897 3 commit-queue 2017-10-07 00:04:12 -0700 All reviewed patches have been landed. Closing bug. 1357898 4 webkit-bug-importer 2017-10-07 00:05:13 -0700 <rdar://problem/34870477> 323085 2017-10-06 22:28:05 -0700 2017-10-07 00:04:10 -0700 Cleanup bug-178044-20171006222804.patch text/plain 4474 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzAxOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTEwLTA2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFdlYkNvbnRlbnRSZWFkZXI6OnJl YWRIVE1MIHNob3VsZCBiZSBzaGFyZWQgYmV0d2VlbiBtYWNPUyBhbmQgaU9TCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgwNDQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNZXJnZWQgdGhlIGltcGxlbWVu dGF0aW9ucyBmb3IgV2ViQ29udGVudFJlYWRlcjo6cmVhZEhUTUwgYmV0d2VlbiBtYWNPUyBhbmQg aU9TLgorCisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW06 CisgICAgICAgIChXZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFkSFRNTCk6CisgICAgICAg ICogZWRpdGluZy9pb3MvV2ViQ29udGVudFJlYWRlcklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkNvbnRlbnRSZWFkZXI6OnJlYWRIVE1MKTogRGVsZXRlZC4KKyAgICAgICAgKiBlZGl0aW5n L21hYy9XZWJDb250ZW50UmVhZGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29udGVu dFJlYWRlcjo6cmVhZEhUTUwpOiBEZWxldGVkLgorCiAyMDE3LTEwLTA2ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVyVGFibGUgc2hvdWxkIG5vdCBob2xk IGEgY29sbGVjdGlvbiBvZiByYXcgcG9pbnRlcnMgdG8gUmVuZGVyVGFibGVDYXB0aW9uCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFk ZXJDb2NvYS5tbQkocmV2aXNpb24gMjIzMDE4KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9j b2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTIxMSw2ICsy MTEsMzIgQEAgYm9vbCBXZWJDb250ZW50UmVhZGVyOjpyZWFkV2ViQXJjaGl2ZShTaAogICAgIHJl dHVybiB0cnVlOwogfQogCitib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRIVE1MKGNvbnN0IFN0 cmluZyYgc3RyaW5nKQoreworICAgIFN0cmluZyBzdHJpbmdPbWl0dGluZ01pY3Jvc29mdFByZWZp eCA9IHN0cmluZzsKKyAgICAKKyNpZiBQTEFURk9STShNQUMpCisgICAgLy8gVGhpcyBjb2RlIHdh cyBhZGRlZCB0byBtYWtlIEhUTUwgcGFzdGUgZnJvbSBNaWNyb3NvZnQgV29yZCBvbiBNYWMgd29y aywgYmFjayBpbiAyMDA0LgorICAgIC8vIEl0J3MgYSBzaW1wbGUtbWluZGVkIHdheSB0byBpZ25v cmUgdGhlIENGX0hUTUwgY2xpcGJvYXJkIGZvcm1hdCwganVzdCBza2lwcGluZyBvdmVyIHRoZQor ICAgIC8vIGRlc2NyaXB0aW9uIHBhcnQgYW5kIHBhcnNpbmcgdGhlIGVudGlyZSBjb250ZXh0IHBs dXMgZnJhZ21lbnQuCisgICAgaWYgKHN0cmluZy5zdGFydHNXaXRoKCJWZXJzaW9uOiIpKSB7Cisg ICAgICAgIHNpemVfdCBsb2NhdGlvbiA9IHN0cmluZy5maW5kSWdub3JpbmdDYXNlKCI8aHRtbCIp OworICAgICAgICBpZiAobG9jYXRpb24gIT0gbm90Rm91bmQpCisgICAgICAgICAgICBzdHJpbmdP bWl0dGluZ01pY3Jvc29mdFByZWZpeCA9IHN0cmluZy5zdWJzdHJpbmcobG9jYXRpb24pOworICAg IH0KKyNlbmRpZgorCisgICAgaWYgKHN0cmluZ09taXR0aW5nTWljcm9zb2Z0UHJlZml4LmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFmcmFtZS5kb2N1bWVudCgp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gKmZyYW1l LmRvY3VtZW50KCk7CisKKyAgICBhZGRGcmFnbWVudChjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAo ZG9jdW1lbnQsIHN0cmluZ09taXR0aW5nTWljcm9zb2Z0UHJlZml4LCBlbXB0eVN0cmluZygpLCBE aXNhbGxvd1NjcmlwdGluZ0FuZFBsdWdpbkNvbnRlbnQpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K KwogYm9vbCBXZWJDb250ZW50UmVhZGVyOjpyZWFkUlRGRChTaGFyZWRCdWZmZXImIGJ1ZmZlcikK IHsKICAgICBpZiAoZnJhbWUuc2V0dGluZ3MoKS5wcmVmZXJNSU1FVHlwZUZvckltYWdlcygpKQpJ bmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3MvV2ViQ29udGVudFJlYWRlcklPUy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2lvcy9XZWJDb250ZW50UmVhZGVy SU9TLm1tCShyZXZpc2lvbiAyMjMwMTgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2lvcy9X ZWJDb250ZW50UmVhZGVySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MiwxNSArNTIsNiBAQCBi b29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRGaWxlbmFtZXMoY29uCiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1ib29sIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRIVE1MKGNvbnN0IFN0cmluZyYgc3Ry aW5nKQotewotICAgIGlmICghZnJhbWUuZG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgYWRkRnJhZ21lbnQoY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKCpmcmFtZS5kb2N1 bWVudCgpLCBzdHJpbmcsIGVtcHR5U3RyaW5nKCksIERpc2FsbG93U2NyaXB0aW5nQW5kUGx1Z2lu Q29udGVudCkpOwotICAgIHJldHVybiB0cnVlOwotfQotCiBib29sIFdlYkNvbnRlbnRSZWFkZXI6 OnJlYWRVUkwoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUpCiB7CiAgICAgaWYg KHVybC5pc0VtcHR5KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9XZWJDb250 ZW50UmVhZGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFj L1dlYkNvbnRlbnRSZWFkZXJNYWMubW0JKHJldmlzaW9uIDIyMzAxOCkKKysrIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvbWFjL1dlYkNvbnRlbnRSZWFkZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTc5LDMwICs3OSw2IEBAIGJvb2wgV2ViQ29udGVudFJlYWRlcjo6cmVhZEZpbGVuYW1lcyhjb24K ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBXZWJDb250ZW50UmVhZGVyOjpyZWFkSFRNTChj b25zdCBTdHJpbmcmIHN0cmluZykKLXsKLSAgICBTdHJpbmcgc3RyaW5nT21pdHRpbmdNaWNyb3Nv ZnRQcmVmaXggPSBzdHJpbmc7Ci0KLSAgICAvLyBUaGlzIGNvZGUgd2FzIGFkZGVkIHRvIG1ha2Ug SFRNTCBwYXN0ZSBmcm9tIE1pY3Jvc29mdCBXb3JkIG9uIE1hYyB3b3JrLCBiYWNrIGluIDIwMDQu Ci0gICAgLy8gSXQncyBhIHNpbXBsZS1taW5kZWQgd2F5IHRvIGlnbm9yZSB0aGUgQ0ZfSFRNTCBj bGlwYm9hcmQgZm9ybWF0LCBqdXN0IHNraXBwaW5nIG92ZXIgdGhlCi0gICAgLy8gZGVzY3JpcHRp b24gcGFydCBhbmQgcGFyc2luZyB0aGUgZW50aXJlIGNvbnRleHQgcGx1cyBmcmFnbWVudC4KLSAg ICBpZiAoc3RyaW5nLnN0YXJ0c1dpdGgoIlZlcnNpb246IikpIHsKLSAgICAgICAgc2l6ZV90IGxv Y2F0aW9uID0gc3RyaW5nLmZpbmRJZ25vcmluZ0Nhc2UoIjxodG1sIik7Ci0gICAgICAgIGlmIChs b2NhdGlvbiAhPSBub3RGb3VuZCkKLSAgICAgICAgICAgIHN0cmluZ09taXR0aW5nTWljcm9zb2Z0 UHJlZml4ID0gc3RyaW5nLnN1YnN0cmluZyhsb2NhdGlvbik7Ci0gICAgfQotCi0gICAgaWYgKHN0 cmluZ09taXR0aW5nTWljcm9zb2Z0UHJlZml4LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotCi0gICAgaWYgKCFmcmFtZS5kb2N1bWVudCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gKmZyYW1lLmRvY3VtZW50KCk7Ci0KLSAgICBmcmFn bWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChkb2N1bWVudCwgc3RyaW5nT21pdHRpbmdN aWNyb3NvZnRQcmVmaXgsIGVtcHR5U3RyaW5nKCksIERpc2FsbG93U2NyaXB0aW5nQW5kUGx1Z2lu Q29udGVudCk7Ci0gICAgcmV0dXJuIGZyYWdtZW50OwotfQotCiBib29sIFdlYkNvbnRlbnRSZWFk ZXI6OnJlYWRVUkwoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUpCiB7CiAgICAg aWYgKHVybC5zdHJpbmcoKS5pc0VtcHR5KCkpCg==