Backed out changeset 614181fad27a (bug 1449064) for assertion failures on workspace/build/src/modules/libpref/Preferences.cpp
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
#include "mozAutoDocUpdate.h"
|
||||
#include "mozilla/IdleTaskRunner.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/StaticPrefs.h"
|
||||
#include "mozilla/css/Loader.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsError.h"
|
||||
@@ -923,10 +922,18 @@ nsHtml5TreeOpExecutor::GetViewSourceBaseURI()
|
||||
return mViewSourceBaseURI;
|
||||
}
|
||||
|
||||
// static
|
||||
void
|
||||
nsHtml5TreeOpExecutor::InitializeStatics()
|
||||
{
|
||||
mozilla::Preferences::AddBoolVarCache(&sExternalViewSource,
|
||||
"view_source.editor.external");
|
||||
}
|
||||
|
||||
bool
|
||||
nsHtml5TreeOpExecutor::IsExternalViewSource()
|
||||
{
|
||||
if (!StaticPrefs::view_source_editor_external()) {
|
||||
if (!sExternalViewSource) {
|
||||
return false;
|
||||
}
|
||||
bool isViewSource = false;
|
||||
@@ -1185,3 +1192,4 @@ uint32_t nsHtml5TreeOpExecutor::sAppendBatchExaminations = 0;
|
||||
uint32_t nsHtml5TreeOpExecutor::sLongestTimeOffTheEventLoop = 0;
|
||||
uint32_t nsHtml5TreeOpExecutor::sTimesFlushLoopInterrupted = 0;
|
||||
#endif
|
||||
bool nsHtml5TreeOpExecutor::sExternalViewSource = false;
|
||||
|
||||
Reference in New Issue
Block a user