From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebCore/html/parser/HTMLParserOptions.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Source/WebCore/html/parser/HTMLParserOptions.cpp')

diff --git a/Source/WebCore/html/parser/HTMLParserOptions.cpp b/Source/WebCore/html/parser/HTMLParserOptions.cpp
index 000d4b02b..0d2d9fb3b 100644
--- a/Source/WebCore/html/parser/HTMLParserOptions.cpp
+++ b/Source/WebCore/html/parser/HTMLParserOptions.cpp
@@ -47,11 +47,10 @@ HTMLParserOptions::HTMLParserOptions(Document& document)
 {
     Frame* frame = document.frame();
     scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecuteScript);
-    pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
+    pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins();
 
-    Settings* settings = document.settings();
-    usePreHTML5ParserQuirks = settings && settings->usePreHTML5ParserQuirks();
-    maximumDOMTreeDepth = settings ? settings->maximumHTMLParserDOMTreeDepth() : Settings::defaultMaximumHTMLParserDOMTreeDepth;
+    usePreHTML5ParserQuirks = document.settings().usePreHTML5ParserQuirks();
+    maximumDOMTreeDepth = document.settings().maximumHTMLParserDOMTreeDepth();
 }
 
 }
-- 
cgit v1.2.1