Changeset 246381 in webkit

Timestamp:

Jun 12, 2019, 3:20:58 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r246182. rdar://problem/51656840

Avoid generating new XSLT-based document when already changing the document.
​https://bugs.webkit.org/show_bug.cgi?id=198525
<rdar://problem/51393787>

Reviewed by Ryosuke Niwa.

We should not allow a pending XSLT transform to change the current document when
that current document is int he process of being replaced.

• dom/Document.cpp: (WebCore::Document::applyPendingXSLTransformsTimerFired):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@246182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-12  Null  <null@apple.com>
+
+        Cherry-pick r246182. rdar://problem/51656840
+
+    Avoid generating new XSLT-based document when already changing the document.
+    https://bugs.webkit.org/show_bug.cgi?id=198525
+    <rdar://problem/51393787>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    We should not allow a pending XSLT transform to change the current document when
+    that current document is int he process of being replaced.
+    
+    * dom/Document.cpp:
+    (WebCore::Document::applyPendingXSLTransformsTimerFired):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246182 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-06-06  Brent Fulgham  <bfulgham@apple.com>
+
+            Avoid generating new XSLT-based document when already changing the document.
+            https://bugs.webkit.org/show_bug.cgi?id=198525
+            <rdar://problem/51393787>
+
+            Reviewed by Ryosuke Niwa.
+
+            We should not allow a pending XSLT transform to change the current document when
+            that current document is int he process of being replaced.
+
+            * dom/Document.cpp:
+            (WebCore::Document::applyPendingXSLTransformsTimerFired):
+
 2019-06-03  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/WebCore/dom/Document.cpp

@@ -5517 +5517 @@
             return;
 
+        // If the Document has already been detached from the frame, or the frame is currently in the process of
+        // changing to a new document, don't attempt to create a new Document from the XSLT.
+        if (!frame() || frame()->documentIsBeingReplaced())
+            return;
+
         auto processor = XSLTProcessor::create();
         processor->setXSLStyleSheet(downcast<XSLStyleSheet>(processingInstruction->sheet()));