170815 2017-04-13 11:33:04 -0700 Fix CMake build 2017-04-13 11:54:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen bdakin oldest_to_newest 1297050 0 achristensen 2017-04-13 11:33:04 -0700 Fix CMake build 1297052 1 307001 achristensen 2017-04-13 11:34:04 -0700 Created attachment 307001 Patch 1297053 2 307001 bdakin 2017-04-13 11:35:43 -0700 Comment on attachment 307001 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=307001&action=review I'm guessing this is fixing multiple build fixes? > Source/WebCore/PlatformMac.cmake:-266 > - loader/cf/SubresourceLoaderCF.cpp Is this also needed? > Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:-761 > - return NO; Same, is this also needed? 1297061 3 achristensen 2017-04-13 11:51:41 -0700 Yep, they're both needed. They solve different problems that also prevent the CMake build from working. 1297064 4 achristensen 2017-04-13 11:54:24 -0700 https://trac.webkit.org/changeset/215328/webkit https://trac.webkit.org/changeset/215329/webkit 307001 2017-04-13 11:34:04 -0700 2017-04-13 11:35:43 -0700 Patch bug-170815-20170413113404.patch text/plain 3915 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTA0LTEzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IENNYWtl IGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzA4MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFBsYXRmb3JtTWFjLmNtYWtlOgorICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQ SS5oOgorCiAyMDE3LTA0LTEzICBSb21haW4gQmVsbGVzc29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0 QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBbUmVhZGFibGUgU3RyZWFtcyBBUEldIEltcGxlbWVu dCBjbG9uZUFycmF5QnVmZmVyIGluIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BsYXRm b3JtTWFjLmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BsYXRmb3JtTWFjLmNt YWtlCShyZXZpc2lvbiAyMTUzMjQpCisrKyBTb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybU1hYy5jbWFr ZQkod29ya2luZyBjb3B5KQpAQCAtMjYzLDcgKzI2Myw2IEBAIGxpc3QoQVBQRU5EIFdlYkNvcmVf U09VUkNFUwogICAgIGxvYWRlci9jb2NvYS9TdWJyZXNvdXJjZUxvYWRlckNvY29hLm1tCiAKICAg ICBsb2FkZXIvY2YvUmVzb3VyY2VMb2FkZXJDRk5ldC5jcHAKLSAgICBsb2FkZXIvY2YvU3VicmVz b3VyY2VMb2FkZXJDRi5jcHAKIAogICAgIGxvYWRlci9tYWMvRG9jdW1lbnRMb2FkZXJNYWMuY3Bw CiAgICAgbG9hZGVyL21hYy9Mb2FkZXJOU1VSTEV4dHJhcy5tbQpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmgJKHJldmlzaW9uIDIxNTMyNCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNzIsNyArMTcyLDggQEAgdHlwZWRlZiBBVkZ1bmN0aW9uQmFyU2NydWJiZXIgQVZU b3VjaEJhcgogI2ltcG9ydCA8QVZLaXQvQVZGdW5jdGlvbkJhclBsYXliYWNrQ29udHJvbHNQcm92 aWRlci5oPgogI2ltcG9ydCA8QVZLaXQvQVZGdW5jdGlvbkJhclNjcnViYmVyLmg+CiAjZW5kaWYg Ly8gX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEzMDAKLSNlbHNlCisKKyNl bGlmIF9fTUFDX09TX1hfVkVSU0lPTl9NQVhfQUxMT1dFRCA8IDEwMTMwMAogCiBOU19BU1NVTUVf Tk9OTlVMTF9CRUdJTgogCkBAIC0xOTksNiArMjAwLDMzIEBAIE5TX0FTU1VNRV9OT05OVUxMX0JF R0lOCiAKIE5TX0FTU1VNRV9OT05OVUxMX0VORAogCisjZWxzZQorCitOU19BU1NVTUVfTk9OTlVM TF9CRUdJTgorCitAcHJvdG9jb2wgQVZUb3VjaEJhclBsYXliYWNrQ29udHJvbHNDb250cm9sbGlu ZyA8TlNPYmplY3Q+CisgICAgQHByb3BlcnR5IChyZWFkb25seSkgTlNUaW1lSW50ZXJ2YWwgY29u dGVudER1cmF0aW9uOworICAgIEBwcm9wZXJ0eSAocmVhZG9ubHksIG51bGxhYmxlKSBBVlZhbHVl VGltaW5nICp0aW1pbmc7CisgICAgQHByb3BlcnR5IChyZWFkb25seSwgZ2V0dGVyID0gaXNTZWVr aW5nKSBCT09MIHNlZWtpbmc7CisgICAgQHByb3BlcnR5IChyZWFkb25seSkgTlNUaW1lSW50ZXJ2 YWwgc2Vla1RvVGltZTsKKy0gKHZvaWQpc2Vla1RvVGltZTooTlNUaW1lSW50ZXJ2YWwpdGltZSB0 b2xlcmFuY2VCZWZvcmU6KE5TVGltZUludGVydmFsKXRvbGVyYW5jZUJlZm9yZSB0b2xlcmFuY2VB ZnRlcjooTlNUaW1lSW50ZXJ2YWwpdG9sZXJhbmNlQWZ0ZXI7CisgICAgQHByb3BlcnR5IChyZWFk b25seSkgQk9PTCBoYXNFbmFibGVkQXVkaW87CisgICAgQHByb3BlcnR5IChyZWFkb25seSkgQk9P TCBoYXNFbmFibGVkVmlkZW87CisgICAgQGVuZAorCitAaW50ZXJmYWNlIEFWVG91Y2hCYXJQbGF5 YmFja0NvbnRyb2xzUHJvdmlkZXIgOiBOU1Jlc3BvbmRlcgorICAgIEBwcm9wZXJ0eSAoc3Ryb25n LCByZWFkb25seSwgbnVsbGFibGUpIE5TVG91Y2hCYXIgKnRvdWNoQmFyOworICAgIEBwcm9wZXJ0 eSAoYXNzaWduLCBudWxsYWJsZSkgaWQ8QVZUb3VjaEJhclBsYXliYWNrQ29udHJvbHNDb250cm9s bGluZz4gcGxheWJhY2tDb250cm9sc0NvbnRyb2xsZXI7CisgICAgQGVuZAorCitAaW50ZXJmYWNl IEFWVG91Y2hCYXJTY3J1YmJlciA6IE5TVmlldworICAgIEBwcm9wZXJ0eSAoYXNzaWduLCBudWxs YWJsZSkgaWQ8QVZUb3VjaEJhclBsYXliYWNrQ29udHJvbHNDb250cm9sbGluZz4gcGxheWJhY2tD b250cm9sc0NvbnRyb2xsZXI7CisgICAgQGVuZAorCitAY2xhc3MgQVZUaHVtYm5haWw7CisKK05T X0FTU1VNRV9OT05OVUxMX0VORAorCiAjZW5kaWYKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykg JiYgRU5BQkxFKFdFQl9QTEFZQkFDS19DT05UUk9MU19NQU5BR0VSKQpJbmRleDogU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwko cmV2aXNpb24gMjE1MzI3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDQtMTMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBGaXggQ01ha2UgYnVpbGQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDgxNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtXS1dlYlZpZXdDb25m aWd1cmF0aW9uIF9zZXRTaG91bGRDYXB0dXJlQXVkaW9JblVJUHJvY2VzczpdKToKKwogMjAxNy0w NC0xMiAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIEZ1 dHVyZS1wcm9vZiAueGNjb25maWcgZmlsZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0J KHJldmlzaW9uIDIxNTMyNCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtNzU3LDEyICs3NTcs OSBAQCAtICh2b2lkKV9zZXRTaG91bGRDYXB0dXJlQXVkaW9JblVJUHJvY2VzCiB7CiAjaWYgRU5B QkxFKE1FRElBX1NUUkVBTSkKICAgICBfc2hvdWxkQ2FwdHVyZUF1ZGlvSW5VSVByb2Nlc3MgPSB2 YWx1ZTsKLSNlbHNlCi0gICAgcmV0dXJuIE5POwogI2VuZGlmCiB9CiAKLQogI2lmIFBMQVRGT1JN KE1BQykKIC0gKEJPT0wpX3Nob3dzVVJMc0luVG9vbFRpcHMKIHsK