<!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>[214017] trunk/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/214017">214017</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2017-03-15 15:56:21 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make a base class for WebGL and WebGPU contexts
https://bugs.webkit.org/show_bug.cgi?id=169651
<rdar://problem/31053489>
Reviewed by Simon Fraser.
Add a new pure virtual base class, GPUBasedCanvasRenderingContext, that
will be used by WebGL and WebGPU rendering contexts. This allows us
to avoid some code duplication, since many places treat the two
as the same.
Also rename is3d() -> isWebGL() and isGPU() -> isWebGPU().
* WebCore.xcodeproj/project.pbxproj: New file.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContextWebGL):
(WebCore::HTMLCanvasElement::getContextWebGPU):
(WebCore::HTMLCanvasElement::reset):
(WebCore::HTMLCanvasElement::paint):
(WebCore::HTMLCanvasElement::isGPUBased):
(WebCore::HTMLCanvasElement::getImageData):
(WebCore::HTMLCanvasElement::isGPU): Deleted.
(WebCore::HTMLCanvasElement::is3D): Deleted.
* html/HTMLCanvasElement.h:
* html/canvas/CanvasRenderingContext.h:
(WebCore::CanvasRenderingContext::isWebGL):
(WebCore::CanvasRenderingContext::isWebGPU):
(WebCore::CanvasRenderingContext::isGPUBased):
(WebCore::CanvasRenderingContext::is3d): Deleted.
(WebCore::CanvasRenderingContext::isGPU): Deleted.
* html/canvas/GPUBasedCanvasRenderingContext.h: Added.
(WebCore::GPUBasedCanvasRenderingContext::GPUBasedCanvasRenderingContext):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::WebGLRenderingContextBase):
* html/canvas/WebGLRenderingContextBase.h:
* html/canvas/WebGPURenderingContext.cpp:
(WebCore::WebGPURenderingContext::WebGPURenderingContext):
* html/canvas/WebGPURenderingContext.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::canvasCompositingStrategy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContexth">trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderingContexth">trunk/Source/WebCore/html/canvas/WebGPURenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorehtmlcanvasGPUBasedCanvasRenderingContexth">trunk/Source/WebCore/html/canvas/GPUBasedCanvasRenderingContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2017-03-15 Dean Jackson <dino@apple.com>
+
+ Make a base class for WebGL and WebGPU contexts
+ https://bugs.webkit.org/show_bug.cgi?id=169651
+ <rdar://problem/31053489>
+
+ Reviewed by Simon Fraser.
+
+ Add a new pure virtual base class, GPUBasedCanvasRenderingContext, that
+ will be used by WebGL and WebGPU rendering contexts. This allows us
+ to avoid some code duplication, since many places treat the two
+ as the same.
+
+ Also rename is3d() -> isWebGL() and isGPU() -> isWebGPU().
+
+ * WebCore.xcodeproj/project.pbxproj: New file.
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::getContextWebGL):
+ (WebCore::HTMLCanvasElement::getContextWebGPU):
+ (WebCore::HTMLCanvasElement::reset):
+ (WebCore::HTMLCanvasElement::paint):
+ (WebCore::HTMLCanvasElement::isGPUBased):
+ (WebCore::HTMLCanvasElement::getImageData):
+ (WebCore::HTMLCanvasElement::isGPU): Deleted.
+ (WebCore::HTMLCanvasElement::is3D): Deleted.
+ * html/HTMLCanvasElement.h:
+ * html/canvas/CanvasRenderingContext.h:
+ (WebCore::CanvasRenderingContext::isWebGL):
+ (WebCore::CanvasRenderingContext::isWebGPU):
+ (WebCore::CanvasRenderingContext::isGPUBased):
+ (WebCore::CanvasRenderingContext::is3d): Deleted.
+ (WebCore::CanvasRenderingContext::isGPU): Deleted.
+ * html/canvas/GPUBasedCanvasRenderingContext.h: Added.
+ (WebCore::GPUBasedCanvasRenderingContext::GPUBasedCanvasRenderingContext):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::WebGLRenderingContextBase):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/canvas/WebGPURenderingContext.cpp:
+ (WebCore::WebGPURenderingContext::WebGPURenderingContext):
+ * html/canvas/WebGPURenderingContext.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::canvasCompositingStrategy):
+
</ins><span class="cx"> 2017-03-15 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Iteratively dispatch DOM events after restoring a cached page
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -1334,6 +1334,7 @@
</span><span class="cx"> 31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */; };
</span><span class="cx"> 310D71951B335C9D009C7B73 /* ThemeCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 310D71931B335C9D009C7B73 /* ThemeCocoa.mm */; };
</span><span class="cx"> 310D71961B335C9E009C7B73 /* ThemeCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 310D71941B335C9D009C7B73 /* ThemeCocoa.h */; };
</span><ins>+ 311518FC1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 311518FB1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h */; };
</ins><span class="cx"> 311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */ = {isa = PBXBuildFile; fileRef = CDC1DD4117CC2C48008CB55D /* mediaControlsApple.css */; };
</span><span class="cx"> 311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */ = {isa = PBXBuildFile; fileRef = CDE6560E17CA6E7600526BA7 /* mediaControlsApple.js */; };
</span><span class="cx"> 311C08BF18EB7CAF00B65615 /* mediaControlsiOS.css in Resources */ = {isa = PBXBuildFile; fileRef = CDAAF45D1869094E003C1717 /* mediaControlsiOS.css */; };
</span><span class="lines">@@ -8817,6 +8818,7 @@
</span><span class="cx"> 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
</span><span class="cx"> 310D71931B335C9D009C7B73 /* ThemeCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ThemeCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 310D71941B335C9D009C7B73 /* ThemeCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeCocoa.h; sourceTree = "<group>"; };
</span><ins>+ 311518FB1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUBasedCanvasRenderingContext.h; sourceTree = "<group>"; };
</ins><span class="cx"> 311C08BC18E35D6800B65615 /* ControlStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControlStates.h; sourceTree = "<group>"; };
</span><span class="cx"> 31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSKeyframeRule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31288E6F0E3005D6003619AE /* CSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSKeyframeRule.h; sourceTree = "<group>"; };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "GPUBasedCanvasRenderingContext.h"
</ins><span class="cx"> #include "GeometryUtilities.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -293,7 +294,7 @@
</span><span class="cx"> if (!shouldEnableWebGL(document().settings()))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (m_context && !m_context->is3d())
</del><ins>+ if (m_context && !m_context->isWebGL())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!m_context) {
</span><span class="lines">@@ -321,7 +322,7 @@
</span><span class="cx"> if (!RuntimeEnabledFeatures::sharedFeatures().webGPUEnabled())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (m_context && !m_context->isGPU())
</del><ins>+ if (m_context && !m_context->isWebGPU())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!m_context) {
</span><span class="lines">@@ -393,17 +394,9 @@
</span><span class="cx">
</span><span class="cx"> setSurfaceSize(newSize);
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU)
- // FIXME: WebGPU needs something here too.
- if (isGPU() && oldSize != size())
- static_cast<WebGPURenderingContext*>(m_context.get())->reshape(width(), height());
-#endif
</del><ins>+ if (isGPUBased() && oldSize != size())
+ downcast<GPUBasedCanvasRenderingContext>(*m_context).reshape(width(), height());
</ins><span class="cx">
</span><del>-#if ENABLE(WEBGL)
- if (is3D() && oldSize != size())
- static_cast<WebGLRenderingContextBase*>(m_context.get())->reshape(width(), height());
-#endif
-
</del><span class="cx"> auto renderer = this->renderer();
</span><span class="cx"> if (is<RenderHTMLCanvas>(renderer)) {
</span><span class="cx"> auto& canvasRenderer = downcast<RenderHTMLCanvas>(*renderer);
</span><span class="lines">@@ -467,31 +460,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU)
- if (isGPU())
- static_cast<WebGPURenderingContext*>(m_context.get())->markLayerComposited();
-#endif
-
-#if ENABLE(WEBGL)
- if (is3D())
- static_cast<WebGLRenderingContextBase*>(m_context.get())->markLayerComposited();
-#endif
</del><ins>+ if (isGPUBased())
+ downcast<GPUBasedCanvasRenderingContext>(*m_context).markLayerComposited();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU)
-bool HTMLCanvasElement::isGPU() const
</del><ins>+bool HTMLCanvasElement::isGPUBased() const
</ins><span class="cx"> {
</span><del>- return m_context && m_context->isGPU();
</del><ins>+ return m_context && m_context->isGPUBased();
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if ENABLE(WEBGL)
-bool HTMLCanvasElement::is3D() const
-{
- return m_context && m_context->is3d();
-}
-#endif
-
</del><span class="cx"> void HTMLCanvasElement::makeRenderingResultsAvailable()
</span><span class="cx"> {
</span><span class="cx"> if (m_context)
</span><span class="lines">@@ -592,7 +569,7 @@
</span><span class="cx"> RefPtr<ImageData> HTMLCanvasElement::getImageData()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>- if (!is3D())
</del><ins>+ if (!m_context || !m_context->isWebGL())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase* ctx = static_cast<WebGLRenderingContextBase*>(m_context.get());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -177,12 +177,7 @@
</span><span class="cx">
</span><span class="cx"> bool paintsIntoCanvasBuffer() const;
</span><span class="cx">
</span><del>-#if ENABLE(WEBGL)
- bool is3D() const;
-#endif
-#if ENABLE(WEBGPU)
- bool isGPU() const;
-#endif
</del><ins>+ bool isGPUBased() const;
</ins><span class="cx">
</span><span class="cx"> HashSet<CanvasObserver*> m_observers;
</span><span class="cx"> std::unique_ptr<CanvasRenderingContext> m_context;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -53,8 +53,11 @@
</span><span class="cx"> virtual bool is2d() const { return false; }
</span><span class="cx"> virtual bool isWebGL1() const { return false; }
</span><span class="cx"> virtual bool isWebGL2() const { return false; }
</span><del>- bool is3d() const { return isWebGL1() || isWebGL2(); }
- virtual bool isGPU() const { return false; }
</del><ins>+ bool isWebGL() const { return isWebGL1() || isWebGL2(); }
+#if ENABLE(WEBGPU)
+ virtual bool isWebGPU() const { return false; }
+#endif
+ virtual bool isGPUBased() const { return false; }
</ins><span class="cx"> virtual bool isAccelerated() const { return false; }
</span><span class="cx">
</span><span class="cx"> virtual void paintRenderingResultsToCanvas() {}
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasGPUBasedCanvasRenderingContexth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/GPUBasedCanvasRenderingContext.h (0 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/GPUBasedCanvasRenderingContext.h (rev 0)
+++ trunk/Source/WebCore/html/canvas/GPUBasedCanvasRenderingContext.h 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "ActiveDOMObject.h"
+#include "CanvasRenderingContext.h"
+
+namespace WebCore {
+
+class GPUBasedCanvasRenderingContext : public CanvasRenderingContext, public ActiveDOMObject {
+public:
+
+ bool isGPUBased() const override { return true; }
+
+ bool isAccelerated() const override
+ {
+#if PLATFORM(WIN)
+ // FIXME: Implement accelerated canvas on Windows.
+ return false;
+#else
+ return true;
+#endif
+ }
+
+ virtual void reshape(int width, int height) = 0;
+ virtual void markLayerComposited() = 0;
+
+protected:
+ GPUBasedCanvasRenderingContext(HTMLCanvasElement& passedCanvas)
+ : CanvasRenderingContext(passedCanvas)
+ , ActiveDOMObject(&passedCanvas.document())
+ {
+ }
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::GPUBasedCanvasRenderingContext, isGPUBased())
</ins><span class="cx">Property changes on: trunk/Source/WebCore/html/canvas/GPUBasedCanvasRenderingContext.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Author Id Revision HeadURL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -460,8 +460,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase::WebGLRenderingContextBase(HTMLCanvasElement& passedCanvas, WebGLContextAttributes attributes)
</span><del>- : CanvasRenderingContext(passedCanvas)
- , ActiveDOMObject(&passedCanvas.document())
</del><ins>+ : GPUBasedCanvasRenderingContext(passedCanvas)
</ins><span class="cx"> , m_dispatchContextLostEventTimer(*this, &WebGLRenderingContextBase::dispatchContextLostEvent)
</span><span class="cx"> , m_restoreTimer(*this, &WebGLRenderingContextBase::maybeRestoreContext)
</span><span class="cx"> , m_attributes(attributes)
</span><span class="lines">@@ -474,8 +473,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase::WebGLRenderingContextBase(HTMLCanvasElement& passedCanvas, Ref<GraphicsContext3D>&& context, WebGLContextAttributes attributes)
</span><del>- : CanvasRenderingContext(passedCanvas)
- , ActiveDOMObject(&passedCanvas.document())
</del><ins>+ : GPUBasedCanvasRenderingContext(passedCanvas)
</ins><span class="cx"> , m_context(WTFMove(context))
</span><span class="cx"> , m_dispatchContextLostEventTimer(*this, &WebGLRenderingContextBase::dispatchContextLostEvent)
</span><span class="cx"> , m_restoreTimer(*this, &WebGLRenderingContextBase::maybeRestoreContext)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -27,9 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx">
</span><del>-#include "ActiveDOMObject.h"
</del><span class="cx"> #include "ActivityStateChangeObserver.h"
</span><del>-#include "CanvasRenderingContext.h"
</del><ins>+#include "GPUBasedCanvasRenderingContext.h"
</ins><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="lines">@@ -110,18 +109,11 @@
</span><span class="cx"> return (*clippedX != x || *clippedY != y || *clippedWidth != width || *clippedHeight != height);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class WebGLRenderingContextBase : public CanvasRenderingContext, private ActivityStateChangeObserver, public ActiveDOMObject {
</del><ins>+class WebGLRenderingContextBase : public GPUBasedCanvasRenderingContext, private ActivityStateChangeObserver {
</ins><span class="cx"> public:
</span><span class="cx"> static std::unique_ptr<WebGLRenderingContextBase> create(HTMLCanvasElement&, WebGLContextAttributes&, const String&);
</span><span class="cx"> virtual ~WebGLRenderingContextBase();
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
- // FIXME: Implement accelerated 3d canvas on Windows.
- bool isAccelerated() const override { return false; }
-#else
- bool isAccelerated() const override { return true; }
-#endif
-
</del><span class="cx"> int drawingBufferWidth() const;
</span><span class="cx"> int drawingBufferHeight() const;
</span><span class="cx">
</span><span class="lines">@@ -347,9 +339,9 @@
</span><span class="cx"> WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
</span><span class="cx"> PlatformLayer* platformLayer() const override;
</span><span class="cx">
</span><del>- void reshape(int width, int height);
</del><ins>+ void reshape(int width, int height) override;
</ins><span class="cx">
</span><del>- void markLayerComposited();
</del><ins>+ void markLayerComposited() final;
</ins><span class="cx"> void paintRenderingResultsToCanvas() override;
</span><span class="cx"> RefPtr<ImageData> paintRenderingResultsToImageData();
</span><span class="cx">
</span><span class="lines">@@ -846,6 +838,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebGLRenderingContextBase, is3d())
</del><ins>+SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebGLRenderingContextBase, isWebGL())
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGPURenderingContext::WebGPURenderingContext(HTMLCanvasElement& canvas, PassRefPtr<GPUDevice> device)
</span><del>- : CanvasRenderingContext(canvas)
- , ActiveDOMObject(&canvas.document())
</del><ins>+ : GPUBasedCanvasRenderingContext(canvas)
</ins><span class="cx"> , m_device(device)
</span><span class="cx"> {
</span><span class="cx"> initializeNewContext();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderingContext.h (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderingContext.h 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderingContext.h 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx">
</span><del>-#include "ActiveDOMObject.h"
-#include "CanvasRenderingContext.h"
</del><ins>+#include "GPUBasedCanvasRenderingContext.h"
</ins><span class="cx"> #include "GPUDevice.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx">
</span><span class="lines">@@ -46,19 +45,16 @@
</span><span class="cx"> class WebGPUTexture;
</span><span class="cx"> class WebGPUTextureDescriptor;
</span><span class="cx">
</span><del>-class WebGPURenderingContext : public CanvasRenderingContext, public ActiveDOMObject {
</del><ins>+class WebGPURenderingContext : public GPUBasedCanvasRenderingContext {
</ins><span class="cx"> public:
</span><span class="cx"> static std::unique_ptr<WebGPURenderingContext> create(HTMLCanvasElement&);
</span><del>-// virtual ~WebGPURenderingContext();
</del><span class="cx">
</span><del>- bool isGPU() const override { return true; }
</del><ins>+ bool isWebGPU() const final { return true; }
</ins><span class="cx">
</span><del>- bool isAccelerated() const override { return true; }
</del><ins>+ void reshape(int width, int height) final;
</ins><span class="cx">
</span><del>- void reshape(int width, int height);
</del><ins>+ void markLayerComposited() final;
</ins><span class="cx">
</span><del>- void markLayerComposited();
-
</del><span class="cx"> PlatformLayer* platformLayer() const override;
</span><span class="cx">
</span><span class="cx"> RefPtr<GPUDevice> device() { return m_device; }
</span><span class="lines">@@ -90,7 +86,6 @@
</span><span class="cx"> void initializeNewContext();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-// WebGPURenderingContext(HTMLCanvasElement*);//, GraphicsContext3D::Attributes);
</del><span class="cx"> WebGPURenderingContext(HTMLCanvasElement&, PassRefPtr<GPUDevice>);
</span><span class="cx">
</span><span class="cx"> RefPtr<GPUDevice> m_device;
</span><span class="lines">@@ -98,6 +93,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebGPURenderingContext, isGPU())
</del><ins>+SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebGPURenderingContext, isWebGPU())
</ins><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (214016 => 214017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-15 22:49:36 UTC (rev 214016)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-15 22:56:21 UTC (rev 214017)
</span><span class="lines">@@ -81,14 +81,9 @@
</span><span class="cx"> if (!context || !context->isAccelerated())
</span><span class="cx"> return UnacceleratedCanvas;
</span><span class="cx">
</span><del>- if (context->is3d())
</del><ins>+ if (context->isGPUBased())
</ins><span class="cx"> return CanvasAsLayerContents;
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU)
- if (context->isGPU())
- return CanvasAsLayerContents;
-#endif
-
</del><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> return CanvasAsLayerContents;
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>