diff options
| author | prr <none@none> | 2017-08-31 12:52:28 -0700 |
|---|---|---|
| committer | prr <none@none> | 2017-08-31 12:52:28 -0700 |
| commit | 984d46a0e62e71c4b15eede0953453c0472a7669 (patch) | |
| tree | f24e6157f95780e84e0dc40b2218f0806134861d | |
| parent | 4e549ac3d27aa51fc80efc91cdda81847f8990e0 (diff) | |
| parent | 7b09f48796a587f36ff4ea749e7c9a3e2bdb2d9c (diff) | |
| download | jdk8u_jfx-984d46a0e62e71c4b15eede0953453c0472a7669.tar.gz | |
Merge
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | modules/web/src/main/native/Source/WebCore/html/parser/HTMLConstructionSite.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -494,6 +494,7 @@ a6e2380a550223314589c733b159f3175afd4497 8u151-b06 871952bd7e6e359c71dface82190eeab72a1a809 8u151-b08 d518da6af98573cbf7aab4e24bf85847087591e0 8u151-b09 2f639073db2de88b8f334ef2f874a330f039ce6f 8u151-b10 +e7e1c7fccd89a3929ec17aef9e684d2f0b6b5864 8u151-b11 e0c5df25bacae7e00475577328355e0f43855f8b 8u152-b06 1c35b82cd17acaf3f80248403bf2e5ad170bfbc7 8u152-b07 7700d1631569aa75a8de9620aa06d29d18e641a9 8u152-b08 diff --git a/modules/web/src/main/native/Source/WebCore/html/parser/HTMLConstructionSite.cpp b/modules/web/src/main/native/Source/WebCore/html/parser/HTMLConstructionSite.cpp index f72f9dbf1..e00834116 100644 --- a/modules/web/src/main/native/Source/WebCore/html/parser/HTMLConstructionSite.cpp +++ b/modules/web/src/main/native/Source/WebCore/html/parser/HTMLConstructionSite.cpp @@ -102,8 +102,10 @@ static inline bool isAllWhitespace(const String& string) static inline void insert(HTMLConstructionSiteTask& task) { - if (is<HTMLTemplateElement>(*task.parent)) + if (is<HTMLTemplateElement>(*task.parent)) { task.parent = &downcast<HTMLTemplateElement>(*task.parent).content(); + task.nextChild = nullptr; + } ASSERT(!task.child->parentNode()); if (task.nextChild) |