Skip to content

Commit

Permalink
Bug 1820576 - Make uriloader/ buildable outside of a unified build en…
Browse files Browse the repository at this point in the history
…vironment r=andi

Differential Revision: https://phabricator.services.mozilla.com/D171734
  • Loading branch information
serge-sans-paille committed Mar 15, 2023
1 parent b0baadf commit 145f585
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 0 additions & 2 deletions uriloader/base/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,3 @@ LOCAL_INCLUDES += [
]

FINAL_LIBRARY = "xul"

REQUIRES_UNIFIED_BUILD = True
8 changes: 5 additions & 3 deletions uriloader/base/nsURILoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "nsURILoader.h"
#include "nsComponentManagerUtils.h"
#include "nsIURIContentListener.h"
#include "nsIContentHandler.h"
#include "nsILoadGroup.h"
Expand Down Expand Up @@ -70,15 +71,16 @@ nsDocumentOpenInfo::nsDocumentOpenInfo(nsIInterfaceRequestor* aWindowContext,
mFlags(aFlags),
mURILoader(aURILoader),
mDataConversionDepthLimit(
StaticPrefs::general_document_open_conversion_depth_limit()) {}
mozilla::StaticPrefs::
general_document_open_conversion_depth_limit()) {}

nsDocumentOpenInfo::nsDocumentOpenInfo(uint32_t aFlags,
bool aAllowListenerConversions)
: m_originalContext(nullptr),
mFlags(aFlags),
mURILoader(nullptr),
mDataConversionDepthLimit(
StaticPrefs::general_document_open_conversion_depth_limit()),
mozilla::StaticPrefs::general_document_open_conversion_depth_limit()),
mAllowListenerConversions(aAllowListenerConversions) {}

nsDocumentOpenInfo::~nsDocumentOpenInfo() {}
Expand Down Expand Up @@ -269,7 +271,7 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) {
LOG((" forceExternalHandling: %s", forceExternalHandling ? "yes" : "no"));

if (forceExternalHandling &&
StaticPrefs::browser_download_open_pdf_attachments_inline()) {
mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline()) {
// Check if this is a PDF which should be opened internally. We also handle
// octet-streams that look like they might be PDFs based on their extension.
bool isPDF = mContentType.LowerCaseEqualsASCII(APPLICATION_PDF);
Expand Down

0 comments on commit 145f585

Please sign in to comment.