bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ScriptForbiddenScope assertion (issue #1643)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-06-01 18:29:17 -04:00
parent ef11636d7a
commit d4b589c46e
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patch/patches/webkit_parser_scriptforbidden_1643.patch Normal file
View File

@@ -0,0 +1,36 @@
diff --git core/html/parser/HTMLConstructionSite.cpp core/html/parser/HTMLConstructionSite.cpp
index 679749a..487323d 100644
--- core/html/parser/HTMLConstructionSite.cpp
+++ core/html/parser/HTMLConstructionSite.cpp
@@ -50,7 +50,6 @@
#include "core/loader/FrameLoaderClient.h"
#include "core/svg/SVGScriptElement.h"
#include "platform/NotImplemented.h"
-#include "platform/ScriptForbiddenScope.h"
#include "platform/text/TextBreakIterator.h"
#include <limits>
@@ -103,10 +102,8 @@ static inline void insert(HTMLConstructionSiteTask& task)
if (isHTMLTemplateElement(*task.parent))
task.parent = toHTMLTemplateElement(task.parent.get())->content();
- if (ContainerNode* parent = task.child->parentNode()) {
- ScriptForbiddenScope forbidScript;
+ if (ContainerNode* parent = task.child->parentNode())
parent->parserRemoveChild(*task.child);
- }
if (task.nextChild)
task.parent->parserInsertBefore(task.child.get(), *task.nextChild);
@@ -153,10 +150,8 @@ static inline void executeReparentTask(HTMLConstructionSiteTask& task)
{
ASSERT(task.operation == HTMLConstructionSiteTask::Reparent);
- if (ContainerNode* parent = task.child->parentNode()) {
- ScriptForbiddenScope forbidScript;
+ if (ContainerNode* parent = task.child->parentNode())
parent->parserRemoveChild(*task.child);
- }
task.parent->parserAppendChild(task.child);
}