141994 2015-02-24 17:42:03 -0800 Fix build break on EFL and GTK port since r180585. 2015-02-24 18:31:45 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141984 1 gyuyoung.kim gyuyoung.kim oldest_to_newest 1071859 0 gyuyoung.kim 2015-02-24 17:42:03 -0800 There are two kind of build error on EFL and GTK ports since r180585. ^ ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp: In member function ‘void WebKit::WebsiteDataStore::fetchData(WebKit::WebsiteDataTypes, std::function<void(WTF::Vector<WebKit::WebsiteDataRecord>)>)::CallbackAggregator::removePendingCallback(WebKit::WebsiteData)’: ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:141:90: error: missing initializer for member ‘WebKit::WebsiteDataRecord::displayName’ [-Werror=missing-field-initializers] auto& record = m_websiteDataRecords.add(displayName, WebsiteDataRecord { }).iterator->value; ^ ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:141:90: error: missing initializer for member ‘WebKit::WebsiteDataRecord::types’ [-Werror=missing-field-initializers] ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:141:90: error: missing initializer for member ‘WebKit::WebsiteDataRecord::origins’ [-Werror=missing-field-initializers] cc1plus: all warnings being treated as errors ninja: build stopped: subcommand failed. ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp: In static member function ‘static WTF::String WebKit::WebsiteDataRecord::displayNameForOrigin(const WebCore::SecurityOrigin&)’: ../../Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp:44:16: error: ‘topPrivatelyControlledDomain’ is not a member of ‘WebCore’ return WebCore::topPrivatelyControlledDomain(securityOrigin.host()); ^ 1071861 1 247285 gyuyoung.kim 2015-02-24 17:43:41 -0800 Created attachment 247285 Patch 1071868 2 247285 simon.fraser 2015-02-24 17:52:11 -0800 Comment on attachment 247285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247285&action=review > Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp:45 > +#if PLATFORM(MAC) Should probably be PLATFORM(COCOA) 1071869 3 247285 joepeck 2015-02-24 17:53:13 -0800 Comment on attachment 247285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247285&action=review > Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp:50 > if (protocol == "http" || protocol == "https") > +#if PLATFORM(MAC) > return WebCore::topPrivatelyControlledDomain(securityOrigin.host()); > +#else > + notImplemented(); > + return String(); > +#endif It looks like you mean this return to be inside the if block, but because the if does not have braces that wouldn't be the case. It still results in identical behavior but in a very misleading way. How about just guarding the entire if block? #if ENABLE(PUBLIC_SUFFIX_LIST) if (protocol == "http" || protocol == "https") return WebCore::topPrivatelyControlledDomain(securityOrigin.host()); #endif Using the same enable guard that wraps topPrivatelyControlledDomain. 1071872 4 247289 gyuyoung.kim 2015-02-24 18:02:25 -0800 Created attachment 247289 Patch 1071873 5 247289 joepeck 2015-02-24 18:03:08 -0800 Comment on attachment 247289 Patch r=me 1071877 6 gyuyoung.kim 2015-02-24 18:31:45 -0800 Committed r180603: <http://trac.webkit.org/changeset/180603> 247285 2015-02-24 17:43:41 -0800 2015-02-24 18:02:18 -0800 Patch bug-141994-20150225104329.patch text/plain 2333 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGY0ZDZlNmU0MGE2N2Q0 YThjNDdiNTNkZjY0M2FhMzU2MzI5MDNjMS4uZDQxMTA4ZjkyZjE3MGMzM2QzMzgwYzgzNjc5NTRk NjJjMTE5MmNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTAyLTI0ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgRml4IGJ1aWxk IGJyZWFrIG9uIEVGTCBhbmQgR1RLIHBvcnQgc2luY2UgcjE4MDU4NS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTk5NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhUmVjb3JkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFSZWNv cmQ6OmRpc3BsYXlOYW1lRm9yT3JpZ2luKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFSZWNv cmQ6OldlYnNpdGVEYXRhUmVjb3JkKToKKwogMjAxNS0wMi0yNCAgQ3NhYmEgT3N6dHJvZ29uw6Fj ICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkZml4IGFmdGVyIHIxODA1ODUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFSZWNvcmQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhUmVjb3JkLmNwcAppbmRleCBjOGE0MjMxYTY2MDFjYTRlMGI2NTU0MTEzNGE0OTIxYmUy N2U4NTA3Li4zMTJmNjNhNmI3NjRhZDIxYTIyMWI2ODc0ZjQ4YTlkZDRhYTMwNGZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFSZWNv cmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVJlY29yZC5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJXZWJzaXRlRGF0YVJlY29yZC5oIgogCisjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBs ZW1lbnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHVibGljU3VmZml4Lmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgogCkBAIC00MSw3ICs0MiwxMiBAQCBTdHJpbmcgV2Vi c2l0ZURhdGFSZWNvcmQ6OmRpc3BsYXlOYW1lRm9yT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luJiBzZQogICAgIH0KIAogICAgIGlmIChwcm90b2NvbCA9PSAiaHR0cCIgfHwgcHJv dG9jb2wgPT0gImh0dHBzIikKKyNpZiBQTEFURk9STShNQUMpCiAgICAgICAgIHJldHVybiBXZWJD b3JlOjp0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKHNlY3VyaXR5T3JpZ2luLmhvc3QoKSk7 CisjZWxzZQorICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICByZXR1cm4gU3RyaW5n KCk7CisjZW5kaWYKIAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVJlY29yZC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgKaW5k ZXggOWYxZGNmM2M0MTNiZGNjNzgwMjMyMzg2NTIxNzQyZDc4MzU1YTg5Yi4uZGFlNGEzNmRlYzZl OWEzZTU4ZDViMGM3YzU5YmU1YmI1NmU2YTM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgKQEAgLTM4LDYg KzM4LDEwIEBAIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0 cnVjdCBXZWJzaXRlRGF0YVJlY29yZCB7CisgICAgV2Vic2l0ZURhdGFSZWNvcmQoKQorICAgICAg ICA6IHR5cGVzKDApCisgICAgeyB9CisKICAgICBzdGF0aWMgU3RyaW5nIGRpc3BsYXlOYW1lRm9y T3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luJik7CiAKICAgICB2b2lkIGFkZChX ZWJzaXRlRGF0YVR5cGVzLCBSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+JiYpOwo= 247289 2015-02-24 18:02:25 -0800 2015-02-24 18:03:08 -0800 Patch bug-141994-20150225110212.patch text/plain 2124 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWU4YzdhYjEyOTQ1ZWJk OTNjN2E4NjcyZDgxNGY0MWQwN2M0OTAzNC4uYjllYTZkOTVkOTc5ZWJkZjI4ZjgxMmNkZjdmYmUx NjdlODBlNzJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTAyLTI0ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgRml4IGJ1aWxk IGJyZWFrIG9uIEVGTCBhbmQgR1RLIHBvcnQgc2luY2UgcjE4MDU4NS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTk5NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhUmVjb3JkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFSZWNv cmQ6OmRpc3BsYXlOYW1lRm9yT3JpZ2luKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFSZWNv cmQ6OldlYnNpdGVEYXRhUmVjb3JkKToKKwogMjAxNS0wMi0yNCAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFtpT1NdIFBhcnNpbmcgc3Vw cG9ydCBmb3IgLWFwcGxlLXRyYWlsaW5nLXdvcmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVJlY29yZC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFSZWNvcmQuY3BwCmluZGV4IGM4 YTQyMzFhNjYwMWNhNGUwYjY1NTQxMTM0YTQ5MjFiZTI3ZTg1MDcuLmY1M2E5Y2QzNTdkN2Y0MDZk MGE4N2FhMWRmNWYxOWVlZWE0MTllZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVJlY29yZC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmNwcApAQCAtNDAsOCAr NDAsMTAgQEAgU3RyaW5nIFdlYnNpdGVEYXRhUmVjb3JkOjpkaXNwbGF5TmFtZUZvck9yaWdpbihj b25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYgc2UKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgfQogCisjaWYgRU5BQkxFKFBVQkxJQ19TVUZGSVhfTElTVCkKICAgICBpZiAo cHJvdG9jb2wgPT0gImh0dHAiIHx8IHByb3RvY29sID09ICJodHRwcyIpCiAgICAgICAgIHJldHVy biBXZWJDb3JlOjp0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKHNlY3VyaXR5T3JpZ2luLmhv c3QoKSk7CisjZW5kaWYKIAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVJlY29yZC5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgK aW5kZXggOWYxZGNmM2M0MTNiZGNjNzgwMjMyMzg2NTIxNzQyZDc4MzU1YTg5Yi4uMzhmZGI4ODYy ZjMyMzc2OTc4YjU4NzI4Mzg5NTAyODk1NjZmNjQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmgKQEAgLTQz LDcgKzQzLDcgQEAgc3RydWN0IFdlYnNpdGVEYXRhUmVjb3JkIHsKICAgICB2b2lkIGFkZChXZWJz aXRlRGF0YVR5cGVzLCBSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+JiYpOwogCiAgICAg U3RyaW5nIGRpc3BsYXlOYW1lOwotICAgIHVuc2lnbmVkIHR5cGVzOworICAgIHVuc2lnbmVkIHR5 cGVzIHsgMCB9OwogICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4g b3JpZ2luczsKIH07CiAK