| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
| 30 #include "core/frame/Settings.h" | 30 #include "core/frame/Settings.h" |
| 31 | 31 |
| 32 namespace blink { | 32 namespace blink { |
| 33 | 33 |
| 34 ScriptableDocumentParser::ScriptableDocumentParser(Document& document, ParserCon
tentPolicy parserContentPolicy) | 34 ScriptableDocumentParser::ScriptableDocumentParser(Document& document, ParserCon
tentPolicy parserContentPolicy) |
| 35 : DecodedDataDocumentParser(document) | 35 : DecodedDataDocumentParser(document) |
| 36 , m_wasCreatedByScript(false) | 36 , m_wasCreatedByScript(false) |
| 37 , m_parserContentPolicy(parserContentPolicy) | 37 , m_parserContentPolicy(parserContentPolicy) |
| 38 { | 38 { |
| 39 if (!pluginContentIsAllowed(m_parserContentPolicy) && (!document.settings()
|| document.settings()->unsafePluginPastingEnabled())) | |
| 40 m_parserContentPolicy = allowPluginContent(m_parserContentPolicy); | |
| 41 } | 39 } |
| 42 | 40 |
| 43 bool ScriptableDocumentParser::isParsingAtLineNumber() const | 41 bool ScriptableDocumentParser::isParsingAtLineNumber() const |
| 44 { | 42 { |
| 45 return isParsing() && !isWaitingForScripts() && !isExecutingScript(); | 43 return isParsing() && !isWaitingForScripts() && !isExecutingScript(); |
| 46 } | 44 } |
| 47 | 45 |
| 48 }; | 46 }; |
| OLD | NEW |