<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[245347] branches/safari-607-branch/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/245347">245347</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-05-15 14:44:39 -0700 (Wed, 15 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/243820">r243820</a>. rdar://problem/50753921

    Crash in HTMLCanvasElement::createContext2d after the element got adopted to a new document
    https://bugs.webkit.org/show_bug.cgi?id=196527

    Reviewed by Antti Koivisto.

    We need to update CanvasBase::m_scriptExecutionContext when HTMLCanvasElement moves from
    one document to another. Fixed the bug by making CanvasBase::scriptExecutionContext make
    a virtual function call instead of directly storing a raw pointer. In HTMLCanvasElement,
    we use Node::scriptExecutionContext(). Use ContextDestructionObserver in CustomPaintCanvas
    and OffscreenCanvas instead of a raw pointer.

    Unfortunately, no new tests since there is no reproducible test case.

    * html/CanvasBase.cpp:
    (WebCore::CanvasBase::CanvasBase):
    * html/CanvasBase.h:
    (WebCore::CanvasBase::scriptExecutionContext const):
    * html/CustomPaintCanvas.cpp:
    (WebCore::CustomPaintCanvas::CustomPaintCanvas):
    * html/CustomPaintCanvas.h:
    * html/HTMLCanvasElement.cpp:
    (WebCore::HTMLCanvasElement::HTMLCanvasElement):
    * html/HTMLCanvasElement.h:
    * html/OffscreenCanvas.cpp:
    (WebCore::OffscreenCanvas::OffscreenCanvas):
    * html/OffscreenCanvas.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243820 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchSourceWebCoreChangeLog">branches/safari-607-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlCanvasBasecpp">branches/safari-607-branch/Source/WebCore/html/CanvasBase.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlCanvasBaseh">branches/safari-607-branch/Source/WebCore/html/CanvasBase.h</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlCustomPaintCanvascpp">branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlCustomPaintCanvash">branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.h</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlHTMLCanvasElementcpp">branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlHTMLCanvasElementh">branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlOffscreenCanvascpp">branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlOffscreenCanvash">branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -1,5 +1,68 @@
</span><span class="cx"> 2019-05-14  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r243820. rdar://problem/50753921
+
+    Crash in HTMLCanvasElement::createContext2d after the element got adopted to a new document
+    https://bugs.webkit.org/show_bug.cgi?id=196527
+    
+    Reviewed by Antti Koivisto.
+    
+    We need to update CanvasBase::m_scriptExecutionContext when HTMLCanvasElement moves from
+    one document to another. Fixed the bug by making CanvasBase::scriptExecutionContext make
+    a virtual function call instead of directly storing a raw pointer. In HTMLCanvasElement,
+    we use Node::scriptExecutionContext(). Use ContextDestructionObserver in CustomPaintCanvas
+    and OffscreenCanvas instead of a raw pointer.
+    
+    Unfortunately, no new tests since there is no reproducible test case.
+    
+    * html/CanvasBase.cpp:
+    (WebCore::CanvasBase::CanvasBase):
+    * html/CanvasBase.h:
+    (WebCore::CanvasBase::scriptExecutionContext const):
+    * html/CustomPaintCanvas.cpp:
+    (WebCore::CustomPaintCanvas::CustomPaintCanvas):
+    * html/CustomPaintCanvas.h:
+    * html/HTMLCanvasElement.cpp:
+    (WebCore::HTMLCanvasElement::HTMLCanvasElement):
+    * html/HTMLCanvasElement.h:
+    * html/OffscreenCanvas.cpp:
+    (WebCore::OffscreenCanvas::OffscreenCanvas):
+    * html/OffscreenCanvas.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243820 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-04-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+            Crash in HTMLCanvasElement::createContext2d after the element got adopted to a new document
+            https://bugs.webkit.org/show_bug.cgi?id=196527
+
+            Reviewed by Antti Koivisto.
+
+            We need to update CanvasBase::m_scriptExecutionContext when HTMLCanvasElement moves from
+            one document to another. Fixed the bug by making CanvasBase::scriptExecutionContext make
+            a virtual function call instead of directly storing a raw pointer. In HTMLCanvasElement,
+            we use Node::scriptExecutionContext(). Use ContextDestructionObserver in CustomPaintCanvas
+            and OffscreenCanvas instead of a raw pointer.
+
+            Unfortunately, no new tests since there is no reproducible test case.
+
+            * html/CanvasBase.cpp:
+            (WebCore::CanvasBase::CanvasBase):
+            * html/CanvasBase.h:
+            (WebCore::CanvasBase::scriptExecutionContext const):
+            * html/CustomPaintCanvas.cpp:
+            (WebCore::CustomPaintCanvas::CustomPaintCanvas):
+            * html/CustomPaintCanvas.h:
+            * html/HTMLCanvasElement.cpp:
+            (WebCore::HTMLCanvasElement::HTMLCanvasElement):
+            * html/HTMLCanvasElement.h:
+            * html/OffscreenCanvas.cpp:
+            (WebCore::OffscreenCanvas::OffscreenCanvas):
+            * html/OffscreenCanvas.h:
+
+2019-05-14  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r239742. rdar://problem/50753925
</span><span class="cx"> 
</span><span class="cx">     Prevent cross-site top-level navigations from third-party iframes
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlCanvasBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/CanvasBase.cpp (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/CanvasBase.cpp    2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/CanvasBase.cpp       2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -34,8 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-CanvasBase::CanvasBase(ScriptExecutionContext* scriptExecutionContext)
-    : m_scriptExecutionContext(scriptExecutionContext)
</del><ins>+CanvasBase::CanvasBase()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlCanvasBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/CanvasBase.h (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/CanvasBase.h      2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/CanvasBase.h 2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">     bool originClean() const { return m_originClean; }
</span><span class="cx"> 
</span><span class="cx">     virtual SecurityOrigin* securityOrigin() const { return nullptr; }
</span><del>-    ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
</del><ins>+    ScriptExecutionContext* scriptExecutionContext() const { return canvasBaseScriptExecutionContext();  }
</ins><span class="cx"> 
</span><span class="cx">     CanvasRenderingContext* renderingContext() const;
</span><span class="cx"> 
</span><span class="lines">@@ -98,8 +98,10 @@
</span><span class="cx">     bool callTracingActive() const;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    CanvasBase(ScriptExecutionContext*);
</del><ins>+    CanvasBase();
</ins><span class="cx"> 
</span><ins>+    virtual ScriptExecutionContext* canvasBaseScriptExecutionContext() const = 0;
+
</ins><span class="cx">     std::unique_ptr<CanvasRenderingContext> m_context;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -107,7 +109,6 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     bool m_didNotifyObserversCanvasDestroyed { false };
</span><span class="cx"> #endif
</span><del>-    ScriptExecutionContext* m_scriptExecutionContext;
</del><span class="cx">     HashSet<CanvasObserver*> m_observers;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlCustomPaintCanvascpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.cpp (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.cpp     2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.cpp        2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CustomPaintCanvas::CustomPaintCanvas(ScriptExecutionContext& context, unsigned width, unsigned height)
</span><del>-    : CanvasBase(&context)
</del><ins>+    : ContextDestructionObserver(&context)
</ins><span class="cx">     , m_size(width, height)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlCustomPaintCanvash"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.h (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.h       2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/CustomPaintCanvas.h  2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class ImageBitmap;
</span><span class="cx"> class PaintRenderingContext2D;
</span><span class="cx"> 
</span><del>-class CustomPaintCanvas final : public RefCounted<CustomPaintCanvas>, public CanvasBase {
</del><ins>+class CustomPaintCanvas final : public RefCounted<CustomPaintCanvas>, public CanvasBase, private ContextDestructionObserver {
</ins><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> 
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> 
</span><span class="cx">     void refCanvasBase() final { ref(); }
</span><span class="cx">     void derefCanvasBase() final { deref(); }
</span><ins>+    ScriptExecutionContext* canvasBaseScriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }
</ins><span class="cx"> 
</span><span class="cx">     mutable GraphicsContext* m_destinationGraphicsContext = nullptr;
</span><span class="cx">     mutable IntSize m_size;
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.cpp (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.cpp     2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.cpp        2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -120,7 +120,6 @@
</span><span class="cx"> 
</span><span class="cx"> HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document& document)
</span><span class="cx">     : HTMLElement(tagName, document)
</span><del>-    , CanvasBase(&document)
</del><span class="cx">     , m_size(defaultWidth, defaultHeight)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(hasTagName(canvasTag));
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.h (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.h       2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/HTMLCanvasElement.h  2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -185,6 +185,8 @@
</span><span class="cx">     void refCanvasBase() final { HTMLElement::ref(); }
</span><span class="cx">     void derefCanvasBase() final { HTMLElement::deref(); }
</span><span class="cx"> 
</span><ins>+    ScriptExecutionContext* canvasBaseScriptExecutionContext() const final { return HTMLElement::scriptExecutionContext(); }
+
</ins><span class="cx">     FloatRect m_dirtyRect;
</span><span class="cx">     mutable IntSize m_size;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlOffscreenCanvascpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.cpp (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.cpp       2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.cpp  2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> OffscreenCanvas::OffscreenCanvas(ScriptExecutionContext& context, unsigned width, unsigned height)
</span><del>-    : CanvasBase(&context)
</del><ins>+    : ContextDestructionObserver(&context)
</ins><span class="cx">     , m_size(width, height)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlOffscreenCanvash"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.h (245346 => 245347)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.h 2019-05-15 21:44:36 UTC (rev 245346)
+++ branches/safari-607-branch/Source/WebCore/html/OffscreenCanvas.h    2019-05-15 21:44:39 UTC (rev 245347)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> using OffscreenRenderingContext = RefPtr<WebGLRenderingContext>;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-class OffscreenCanvas final : public RefCounted<OffscreenCanvas>, public CanvasBase, public EventTargetWithInlineData {
</del><ins>+class OffscreenCanvas final : public RefCounted<OffscreenCanvas>, public CanvasBase, public EventTargetWithInlineData, private ContextDestructionObserver {
</ins><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> 
</span><span class="lines">@@ -94,7 +94,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool isOffscreenCanvas() const final { return true; }
</span><span class="cx"> 
</span><del>-    ScriptExecutionContext* scriptExecutionContext() const final { return CanvasBase::scriptExecutionContext(); }
</del><ins>+    ScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }
+    ScriptExecutionContext* canvasBaseScriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }
</ins><span class="cx"> 
</span><span class="cx">     EventTargetInterface eventTargetInterface() const final { return OffscreenCanvasEventTargetInterfaceType; }
</span><span class="cx">     void refEventTarget() final { ref(); }
</span></span></pre>
</div>
</div>

</body>
</html>