167771 2017-02-02 18:29:48 -0800 REGRESSION(r210845): Build broken with ENABLE_MHTML disabled 2017-02-13 01:54:53 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 167055 1 clopez ossy achristensen cdumez commit-queue darin dbates japhet lforschler ossy oldest_to_newest 1272756 0 clopez 2017-02-02 18:29:48 -0800 After r210845 <http://trac.webkit.org/changeset/210845> building WebKit without MHTML support fails: ../../Source/WebCore/loader/DocumentLoader.cpp:867:13: error: use of undeclared identifier 'm_archive' if (m_archive && m_archive->shouldOverrideBaseURL()) ^ ../../Source/WebCore/loader/DocumentLoader.cpp:867:26: error: use of undeclared identifier 'm_archive' if (m_archive && m_archive->shouldOverrideBaseURL()) ^ ../../Source/WebCore/loader/DocumentLoader.cpp:868:53: error: use of undeclared identifier 'm_archive' m_frame->document()->setBaseURLOverride(m_archive->mainResource()->url()); ^ ../../Source/WebCore/loader/DocumentLoader.cpp:884:17: error: use of undeclared identifier 'm_archive' if (m_archive && m_archive->shouldUseMainResourceEncoding()) ^ ../../Source/WebCore/loader/DocumentLoader.cpp:884:30: error: use of undeclared identifier 'm_archive' if (m_archive && m_archive->shouldUseMainResourceEncoding()) ^ ../../Source/WebCore/loader/DocumentLoader.cpp:885:28: error: use of undeclared identifier 'm_archive' encoding = m_archive->mainResource()->textEncoding(); ^ ../../Source/WebCore/loader/DocumentLoader.cpp:1128:30: error: member access into incomplete type 'WebCore::ArchiveResource' if (!resource || resource->shouldIgnoreWhenUnarchiving()) ^ 1275273 1 301142 ossy 2017-02-10 02:22:50 -0800 Created attachment 301142 Patch 1275302 2 301142 dbates 2017-02-10 05:00:53 -0800 Comment on attachment 301142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301142&action=review > Source/WebCore/loader/DocumentLoader.cpp:34 > +#include "Archive.h" Did you mean to add this? Notice that Archive.h is included by ArchiveFactory.h (below), which is is conditionally included when either ENABLE(WEB_ARCHIVE) or ENABLE(MHTML) is enabled. 1276135 3 ossy 2017-02-13 01:29:25 -0800 (In reply to comment #2) > Comment on attachment 301142 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301142&action=review > > > Source/WebCore/loader/DocumentLoader.cpp:34 > > +#include "Archive.h" > > Did you mean to add this? Notice that Archive.h is included by > ArchiveFactory.h (below), which is is conditionally included when either > ENABLE(WEB_ARCHIVE) or ENABLE(MHTML) is enabled. Yes. As you mentioned, ArchiveFactory.h is included only if ENABLE(WEB_ARCHIVE) or ENABLE(MHTML)is enabled. But Archive.h is necessary if both of them are disabled. Without including Archive.h, the build fails with the following error: ../../Source/WebCore/loader/DocumentLoader.cpp: In member function 'WebCore::ArchiveResource* WebCore::DocumentLoader::archiveResourceForURL(const WebCore::URL&) const': ../../Source/WebCore/loader/DocumentLoader.cpp:1133:30: error: invalid use of incomplete type 'class WebCore::ArchiveResource' 1276139 4 301142 commit-queue 2017-02-13 01:54:48 -0800 Comment on attachment 301142 Patch Clearing flags on attachment: 301142 Committed r212227: <http://trac.webkit.org/changeset/212227> 1276140 5 commit-queue 2017-02-13 01:54:53 -0800 All reviewed patches have been landed. Closing bug. 301142 2017-02-10 02:22:50 -0800 2017-02-13 01:54:48 -0800 Patch bug-167771-20170210112023.patch text/plain 2271 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhjZjUzNjg4OWMwYWJl YTFjYzhmOWU0ZGRhYmI2NWRlMWZkYWNkNC4uZTkwNmIwMWIyNzRjYjc5ODBhMzYzZjczM2YwNGM4 N2EwNWQxZGU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE3LTAyLTEwICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihy MjEwODQ1KSBCdWlsZCBicm9rZW4gd2l0aCBFTkFCTEVfTUhUTUwgZGlzYWJsZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Nzc3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjb21taXREYXRh KToKKwogMjAxNy0wMi0wOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBJbXByb3ZlIElPU3VyZmFjZVBvb2wgbG9nZ2luZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggNDU0YTk1ZjUzZGE2NmY5ZmYxMWVjZDdmNjlh Y2FiMGUwMDJmY2E4NC4uZWRlYjllMDU2MzYwN2I4ZDNkYWNkOTljYWFjMjMxNDA4ZTc1ZDYxZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0zMSw2ICszMSw3 IEBACiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKIAogI2luY2x1ZGUgIkFwcGxpY2F0aW9u Q2FjaGVIb3N0LmgiCisjaW5jbHVkZSAiQXJjaGl2ZS5oIgogI2luY2x1ZGUgIkFyY2hpdmVSZXNv dXJjZUNvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJDYWNoZWRQYWdlLmgiCiAjaW5jbHVkZSAiQ2Fj aGVkUmF3UmVzb3VyY2UuaCIKQEAgLTg2Myw5ICs4NjQsMTEgQEAgdm9pZCBEb2N1bWVudExvYWRl cjo6Y29tbWl0RGF0YShjb25zdCBjaGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCkKIAogICAgICAg ICBpZiAoZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCkuY3JlYXRpbmdJbml0aWFsRW1wdHlE b2N1bWVudCgpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAKKworI2lmIEVOQUJMRShX RUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQogICAgICAgICBpZiAobV9hcmNoaXZlICYmIG1f YXJjaGl2ZS0+c2hvdWxkT3ZlcnJpZGVCYXNlVVJMKCkpCiAgICAgICAgICAgICBtX2ZyYW1lLT5k b2N1bWVudCgpLT5zZXRCYXNlVVJMT3ZlcnJpZGUobV9hcmNoaXZlLT5tYWluUmVzb3VyY2UoKS0+ dXJsKCkpOworI2VuZGlmCiAKICAgICAgICAgLy8gQ2FsbCByZWNlaXZlZEZpcnN0RGF0YSgpIGV4 YWN0bHkgb25jZSBwZXIgbG9hZC4gV2Ugc2hvdWxkIG9ubHkgcmVhY2ggdGhpcyBwb2ludCBtdWx0 aXBsZSB0aW1lcwogICAgICAgICAvLyBmb3IgbXVsdGlwYXJ0IGxvYWRzLCBhbmQgRnJhbWVMb2Fk ZXI6OmlzUmVwbGFjaW5nKCkgd2lsbCBiZSB0cnVlIGFmdGVyIHRoZSBmaXJzdCB0aW1lLgpAQCAt ODgxLDggKzg4NCwxMCBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpjb21taXREYXRhKGNvbnN0IGNo YXIqIGJ5dGVzLCBzaXplX3QgbGVuZ3RoKQogICAgICAgICBpZiAob3ZlcnJpZGVFbmNvZGluZygp LmlzTnVsbCgpKSB7CiAgICAgICAgICAgICB1c2VyQ2hvc2VuID0gZmFsc2U7CiAgICAgICAgICAg ICBlbmNvZGluZyA9IHJlc3BvbnNlKCkudGV4dEVuY29kaW5nTmFtZSgpOworI2lmIEVOQUJMRShX RUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQogICAgICAgICAgICAgaWYgKG1fYXJjaGl2ZSAm JiBtX2FyY2hpdmUtPnNob3VsZFVzZU1haW5SZXNvdXJjZUVuY29kaW5nKCkpCiAgICAgICAgICAg ICAgICAgZW5jb2RpbmcgPSBtX2FyY2hpdmUtPm1haW5SZXNvdXJjZSgpLT50ZXh0RW5jb2Rpbmco KTsKKyNlbmRpZgogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdXNlckNob3NlbiA9IHRy dWU7CiAgICAgICAgICAgICBlbmNvZGluZyA9IG92ZXJyaWRlRW5jb2RpbmcoKTsK