REGRESSION(r210845): Build broken with ENABLE_MHTML disabled

[Carlos Alberto Lopez Perez]

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())
                             ^

[Csaba Osztrogonác]

Created attachment 301142 [details]
Patch

[Daniel Bates]

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.

[Csaba Osztrogonác]

(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'

[WebKit Commit Bot]

Comment on attachment 301142 [details]
Patch

Clearing flags on attachment: 301142

Committed r212227: <http://trac.webkit.org/changeset/212227>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.