<!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>[280968] 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/280968">280968</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-12 08:47:18 -0700 (Thu, 12 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Removal of "TypedOM" prefix for CSSOM Object names
https://bugs.webkit.org/show_bug.cgi?id=229028

Patch by Johnson Zhou <qiaosong_zhou@apple.com> on 2021-08-12
Reviewed by Alex Christensen.

* CMakeLists.txt:
* DerivedSources-input.xcfilelist:
* DerivedSources-output.xcfilelist:
* DerivedSources.make:
* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCSSStyleValueCustom.cpp: Renamed from Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp.
(WebCore::toJSNewlyCreated):
(WebCore::toJS):
* css/typedom/CSSNumericValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp.
* css/typedom/CSSNumericValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.h.
* css/typedom/CSSNumericValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl.
* css/typedom/CSSStyleImageValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp.
(WebCore::CSSStyleImageValue::CSSStyleImageValue):
(WebCore::CSSStyleImageValue::document const):
* css/typedom/CSSStyleImageValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.h.
* css/typedom/CSSStyleImageValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.idl.
* css/typedom/CSSStyleValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp.
* css/typedom/CSSStyleValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.h.
* css/typedom/CSSStyleValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl.
* css/typedom/CSSUnitValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp.
* css/typedom/CSSUnitValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.h.
* css/typedom/CSSUnitValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl.
* css/typedom/CSSUnparsedValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp.
* css/typedom/CSSUnparsedValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h.
* css/typedom/CSSUnparsedValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl.
* css/typedom/StylePropertyMapReadOnly.cpp:
(WebCore::StylePropertyMapReadOnly::reifyValue):
(WebCore::StylePropertyMapReadOnly::customPropertyValueOrDefault):
* css/typedom/StylePropertyMapReadOnly.h:
* css/typedom/StylePropertyMapReadOnly.idl:
* dom/StyledElement.cpp:
* html/CustomPaintImage.cpp:
(WebCore::extractComputedProperty):
(WebCore::CustomPaintImage::doCustomPaint):
* html/ImageBitmap.cpp:
(WebCore::ImageBitmap::createPromise):
* html/ImageBitmap.h:
* html/canvas/CanvasDrawImage.idl:
* html/canvas/CanvasFillStrokeStyles.idl:
* html/canvas/CanvasRenderingContext.cpp:
(WebCore::CanvasRenderingContext::checkOrigin):
* html/canvas/CanvasRenderingContext.h:
* html/canvas/CanvasRenderingContext2DBase.cpp:
(WebCore::size):
(WebCore::CanvasRenderingContext2DBase::drawImage):
(WebCore::CanvasRenderingContext2DBase::createPattern):
* html/canvas/CanvasRenderingContext2DBase.h:
* inspector/InspectorCanvas.cpp:
(WebCore::InspectorCanvas::processArgument):
(WebCore::InspectorCanvas::indexForData):
* inspector/InspectorCanvas.h:
* inspector/InspectorCanvasCallTracer.cpp:
* inspector/InspectorCanvasCallTracer.h:
* inspector/agents/InspectorCanvasAgent.cpp:
* page/WindowOrWorkerGlobalScope.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesinputxcfilelist">trunk/Source/WebCore/DerivedSources-input.xcfilelist</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesoutputxcfilelist">trunk/Source/WebCore/DerivedSources-output.xcfilelist</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreSourcestxt">trunk/Source/WebCore/Sources.txt</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecsstypedomStylePropertyMapReadOnlycpp">trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomStylePropertyMapReadOnlyh">trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomStylePropertyMapReadOnlyidl">trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.idl</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlCustomPaintImagecpp">trunk/Source/WebCore/html/CustomPaintImage.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageBitmapcpp">trunk/Source/WebCore/html/ImageBitmap.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageBitmaph">trunk/Source/WebCore/html/ImageBitmap.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasDrawImageidl">trunk/Source/WebCore/html/canvas/CanvasDrawImage.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasFillStrokeStylesidl">trunk/Source/WebCore/html/canvas/CanvasFillStrokeStyles.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContextcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContexth">trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBaseh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvascpp">trunk/Source/WebCore/inspector/InspectorCanvas.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvash">trunk/Source/WebCore/inspector/InspectorCanvas.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasCallTracercpp">trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasCallTracerh">trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.h</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsInspectorCanvasAgentcpp">trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageWindowOrWorkerGlobalScopeidl">trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleValueCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleValueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSNumericValuecpp">trunk/Source/WebCore/css/typedom/CSSNumericValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSNumericValueh">trunk/Source/WebCore/css/typedom/CSSNumericValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSNumericValueidl">trunk/Source/WebCore/css/typedom/CSSNumericValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleImageValuecpp">trunk/Source/WebCore/css/typedom/CSSStyleImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleImageValueh">trunk/Source/WebCore/css/typedom/CSSStyleImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleImageValueidl">trunk/Source/WebCore/css/typedom/CSSStyleImageValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleValuecpp">trunk/Source/WebCore/css/typedom/CSSStyleValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleValueh">trunk/Source/WebCore/css/typedom/CSSStyleValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSStyleValueidl">trunk/Source/WebCore/css/typedom/CSSStyleValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnitValuecpp">trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnitValueh">trunk/Source/WebCore/css/typedom/CSSUnitValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnitValueidl">trunk/Source/WebCore/css/typedom/CSSUnitValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnparsedValuecpp">trunk/Source/WebCore/css/typedom/CSSUnparsedValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnparsedValueh">trunk/Source/WebCore/css/typedom/CSSUnparsedValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomCSSUnparsedValueidl">trunk/Source/WebCore/css/typedom/CSSUnparsedValue.idl</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSTypedOMCSSStyleValueCustomcpp">trunk/Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSImageValuecpp">trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSImageValueh">trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSImageValueidl">trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSNumericValuecpp">trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSNumericValueh">trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSNumericValueidl">trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSStyleValuecpp">trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSStyleValueh">trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSStyleValueidl">trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnitValuecpp">trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnitValueh">trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnitValueidl">trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValuecpp">trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueh">trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h</a></li>
<li><a href="#trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueidl">trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -714,13 +714,13 @@
</span><span class="cx">     css/StyleSheet.idl
</span><span class="cx">     css/StyleSheetList.idl
</span><span class="cx"> 
</span><ins>+    css/typedom/CSSNumericValue.idl
+    css/typedom/CSSStyleImageValue.idl
+    css/typedom/CSSStyleValue.idl
+    css/typedom/CSSUnitValue.idl
+    css/typedom/CSSUnparsedValue.idl
</ins><span class="cx">     css/typedom/StylePropertyMap.idl
</span><span class="cx">     css/typedom/StylePropertyMapReadOnly.idl
</span><del>-    css/typedom/TypedOMCSSImageValue.idl
-    css/typedom/TypedOMCSSNumericValue.idl
-    css/typedom/TypedOMCSSStyleValue.idl
-    css/typedom/TypedOMCSSUnitValue.idl
-    css/typedom/TypedOMCSSUnparsedValue.idl
</del><span class="cx"> 
</span><span class="cx">     dom/AbortAlgorithm.idl
</span><span class="cx">     dom/AbortController.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/ChangeLog      2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2021-08-12  Johnson Zhou  <qiaosong_zhou@apple.com>
+
+        Removal of "TypedOM" prefix for CSSOM Object names
+        https://bugs.webkit.org/show_bug.cgi?id=229028
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+        * DerivedSources-input.xcfilelist:
+        * DerivedSources-output.xcfilelist:
+        * DerivedSources.make:
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSCSSStyleValueCustom.cpp: Renamed from Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp.
+        (WebCore::toJSNewlyCreated):
+        (WebCore::toJS):
+        * css/typedom/CSSNumericValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp.
+        * css/typedom/CSSNumericValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.h.
+        * css/typedom/CSSNumericValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl.
+        * css/typedom/CSSStyleImageValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp.
+        (WebCore::CSSStyleImageValue::CSSStyleImageValue):
+        (WebCore::CSSStyleImageValue::document const):
+        * css/typedom/CSSStyleImageValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.h.
+        * css/typedom/CSSStyleImageValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSImageValue.idl.
+        * css/typedom/CSSStyleValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp.
+        * css/typedom/CSSStyleValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.h.
+        * css/typedom/CSSStyleValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl.
+        * css/typedom/CSSUnitValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp.
+        * css/typedom/CSSUnitValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.h.
+        * css/typedom/CSSUnitValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl.
+        * css/typedom/CSSUnparsedValue.cpp: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp.
+        * css/typedom/CSSUnparsedValue.h: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h.
+        * css/typedom/CSSUnparsedValue.idl: Renamed from Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl.
+        * css/typedom/StylePropertyMapReadOnly.cpp:
+        (WebCore::StylePropertyMapReadOnly::reifyValue):
+        (WebCore::StylePropertyMapReadOnly::customPropertyValueOrDefault):
+        * css/typedom/StylePropertyMapReadOnly.h:
+        * css/typedom/StylePropertyMapReadOnly.idl:
+        * dom/StyledElement.cpp:
+        * html/CustomPaintImage.cpp:
+        (WebCore::extractComputedProperty):
+        (WebCore::CustomPaintImage::doCustomPaint):
+        * html/ImageBitmap.cpp:
+        (WebCore::ImageBitmap::createPromise):
+        * html/ImageBitmap.h:
+        * html/canvas/CanvasDrawImage.idl:
+        * html/canvas/CanvasFillStrokeStyles.idl:
+        * html/canvas/CanvasRenderingContext.cpp:
+        (WebCore::CanvasRenderingContext::checkOrigin):
+        * html/canvas/CanvasRenderingContext.h:
+        * html/canvas/CanvasRenderingContext2DBase.cpp:
+        (WebCore::size):
+        (WebCore::CanvasRenderingContext2DBase::drawImage):
+        (WebCore::CanvasRenderingContext2DBase::createPattern):
+        * html/canvas/CanvasRenderingContext2DBase.h:
+        * inspector/InspectorCanvas.cpp:
+        (WebCore::InspectorCanvas::processArgument):
+        (WebCore::InspectorCanvas::indexForData):
+        * inspector/InspectorCanvas.h:
+        * inspector/InspectorCanvasCallTracer.cpp:
+        * inspector/InspectorCanvasCallTracer.h:
+        * inspector/agents/InspectorCanvasAgent.cpp:
+        * page/WindowOrWorkerGlobalScope.idl:
+
</ins><span class="cx"> 2021-08-12  Kimmo Kinnunen  <kkinnunen@apple.com>
</span><span class="cx"> 
</span><span class="cx">         webgl/1.0.x/conformance/textures/misc/texture-corner-case-videos.html fails on Cocoa
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesinputxcfilelist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources-input.xcfilelist     2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -728,11 +728,11 @@
</span><span class="cx"> $(PROJECT_DIR)/css/svg.css
</span><span class="cx"> $(PROJECT_DIR)/css/typedom/StylePropertyMap.idl
</span><span class="cx"> $(PROJECT_DIR)/css/typedom/StylePropertyMapReadOnly.idl
</span><del>-$(PROJECT_DIR)/css/typedom/TypedOMCSSImageValue.idl
-$(PROJECT_DIR)/css/typedom/TypedOMCSSNumericValue.idl
-$(PROJECT_DIR)/css/typedom/TypedOMCSSStyleValue.idl
-$(PROJECT_DIR)/css/typedom/TypedOMCSSUnitValue.idl
-$(PROJECT_DIR)/css/typedom/TypedOMCSSUnparsedValue.idl
</del><ins>+$(PROJECT_DIR)/css/typedom/CSSStyleImageValue.idl
+$(PROJECT_DIR)/css/typedom/CSSNumericValue.idl
+$(PROJECT_DIR)/css/typedom/CSSStyleValue.idl
+$(PROJECT_DIR)/css/typedom/CSSUnitValue.idl
+$(PROJECT_DIR)/css/typedom/CSSUnparsedValue.idl
</ins><span class="cx"> $(PROJECT_DIR)/dom/AbortAlgorithm.idl
</span><span class="cx"> $(PROJECT_DIR)/dom/AbortController.idl
</span><span class="cx"> $(PROJECT_DIR)/dom/AbortSignal.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesoutputxcfilelist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources-output.xcfilelist    2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -2241,16 +2241,16 @@
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTreeWalker.h
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypeConversions.cpp
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypeConversions.h
</span><del>-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSImageValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSImageValue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSNumericValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSNumericValue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSStyleValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSStyleValue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSUnitValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSUnitValue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSUnparsedValue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTypedOMCSSUnparsedValue.h
</del><ins>+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleImageValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSNumericValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSStyleValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnitValue.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSCSSUnparsedValue.h
</ins><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEvent.cpp
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEvent.h
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSUIEventInit.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/DerivedSources.make    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -599,11 +599,11 @@
</span><span class="cx">     $(WebCore)/css/StyleSheetList.idl \
</span><span class="cx">     $(WebCore)/css/typedom/StylePropertyMap.idl \
</span><span class="cx">     $(WebCore)/css/typedom/StylePropertyMapReadOnly.idl \
</span><del>-    $(WebCore)/css/typedom/TypedOMCSSImageValue.idl \
-    $(WebCore)/css/typedom/TypedOMCSSNumericValue.idl \
-    $(WebCore)/css/typedom/TypedOMCSSStyleValue.idl \
-    $(WebCore)/css/typedom/TypedOMCSSUnitValue.idl \
-    $(WebCore)/css/typedom/TypedOMCSSUnparsedValue.idl \
</del><ins>+    $(WebCore)/css/typedom/CSSStyleImageValue.idl \
+    $(WebCore)/css/typedom/CSSNumericValue.idl \
+    $(WebCore)/css/typedom/CSSStyleValue.idl \
+    $(WebCore)/css/typedom/CSSUnitValue.idl \
+    $(WebCore)/css/typedom/CSSUnparsedValue.idl \
</ins><span class="cx">     $(WebCore)/dom/AbortAlgorithm.idl \
</span><span class="cx">     $(WebCore)/dom/AbortController.idl \
</span><span class="cx">     $(WebCore)/dom/AbortSignal.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Sources.txt (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Sources.txt 2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/Sources.txt    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> bindings/js/JSTextTrackCueCustom.cpp
</span><span class="cx"> bindings/js/JSTrackCustom.cpp
</span><span class="cx"> bindings/js/JSTreeWalkerCustom.cpp
</span><del>-bindings/js/JSTypedOMCSSStyleValueCustom.cpp
</del><ins>+bindings/js/JSCSSStyleValueCustom.cpp
</ins><span class="cx"> bindings/js/JSUndoItemCustom.cpp
</span><span class="cx"> bindings/js/JSWebAnimationCustom.cpp
</span><span class="cx"> bindings/js/JSWebGL2RenderingContextCustom.cpp
</span><span class="lines">@@ -765,11 +765,11 @@
</span><span class="cx"> css/parser/SizesAttributeParser.cpp
</span><span class="cx"> css/parser/SizesCalcParser.cpp
</span><span class="cx"> css/typedom/StylePropertyMapReadOnly.cpp
</span><del>-css/typedom/TypedOMCSSImageValue.cpp
-css/typedom/TypedOMCSSNumericValue.cpp
-css/typedom/TypedOMCSSStyleValue.cpp
-css/typedom/TypedOMCSSUnitValue.cpp
-css/typedom/TypedOMCSSUnparsedValue.cpp
</del><ins>+css/typedom/CSSStyleImageValue.cpp
+css/typedom/CSSNumericValue.cpp
+css/typedom/CSSStyleValue.cpp
+css/typedom/CSSUnitValue.cpp
+css/typedom/CSSUnparsedValue.cpp
</ins><span class="cx"> cssjit/SelectorCompiler.cpp
</span><span class="cx"> display/compositing/DisplayLayerController.cpp
</span><span class="cx"> display/css/DisplayBox.cpp
</span><span class="lines">@@ -3585,11 +3585,11 @@
</span><span class="cx"> JSTransformStreamDefaultController.cpp
</span><span class="cx"> JSTransitionEvent.cpp
</span><span class="cx"> JSTreeWalker.cpp
</span><del>-JSTypedOMCSSImageValue.cpp
-JSTypedOMCSSNumericValue.cpp
-JSTypedOMCSSStyleValue.cpp
-JSTypedOMCSSUnitValue.cpp
-JSTypedOMCSSUnparsedValue.cpp
</del><ins>+JSCSSStyleImageValue.cpp
+JSCSSNumericValue.cpp
+JSCSSStyleValue.cpp
+JSCSSUnitValue.cpp
+JSCSSUnparsedValue.cpp
</ins><span class="cx"> JSUIEvent.cpp
</span><span class="cx"> JSUIEventInit.cpp
</span><span class="cx"> JSURLSearchParams.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1406,7 +1406,7 @@
</span><span class="cx">          4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2708C50AF19EE40065127F /* Pasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          4B3043CD0AE0373B00A82647 /* Editor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043CB0AE0373B00A82647 /* Editor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; };
</span><del>-               4B438650219CD56100F8D3C5 /* TypedOMCSSImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B43864F219CD56100F8D3C5 /* TypedOMCSSImageValue.h */; };
</del><ins>+                4B438650219CD56100F8D3C5 /* CSSStyleImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B43864F219CD56100F8D3C5 /* CSSStyleImageValue.h */; };
</ins><span class="cx">           4B5BDD9B21658A1500DD4262 /* CSSPaintCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B5BDD9A21658A1500DD4262 /* CSSPaintCallback.h */; };
</span><span class="cx">          4B6B5CBD21640EFF00603817 /* DOMCSSPaintWorklet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6B5CB82163EC0700603817 /* DOMCSSPaintWorklet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          4B6B5CC02164386400603817 /* PaintWorkletGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6B5CBF2164386400603817 /* PaintWorkletGlobalScope.h */; };
</span><span class="lines">@@ -1415,10 +1415,10 @@
</span><span class="cx">          4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          4BAFD0CB2190EBD600C0AB64 /* CSSPaintSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0CA2190EBD600C0AB64 /* CSSPaintSize.h */; };
</span><span class="cx">          4BAFD0CF2190F9B500C0AB64 /* StylePropertyMapReadOnly.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0CE2190F9B400C0AB64 /* StylePropertyMapReadOnly.h */; };
</span><del>-               4BAFD0D62192146B00C0AB64 /* TypedOMCSSStyleValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0D52192146B00C0AB64 /* TypedOMCSSStyleValue.h */; };
-               4BAFD0D921921EA000C0AB64 /* TypedOMCSSUnparsedValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0D821921EA000C0AB64 /* TypedOMCSSUnparsedValue.h */; };
-               4BAFD0E0219220AB00C0AB64 /* TypedOMCSSNumericValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0DF219220AB00C0AB64 /* TypedOMCSSNumericValue.h */; };
-               4BAFD0E1219242A000C0AB64 /* TypedOMCSSUnitValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0DD2192209200C0AB64 /* TypedOMCSSUnitValue.h */; };
</del><ins>+                4BAFD0D62192146B00C0AB64 /* CSSStyleValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0D52192146B00C0AB64 /* CSSStyleValue.h */; };
+               4BAFD0D921921EA000C0AB64 /* CSSUnparsedValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0D821921EA000C0AB64 /* CSSUnparsedValue.h */; };
+               4BAFD0E0219220AB00C0AB64 /* CSSNumericValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0DF219220AB00C0AB64 /* CSSNumericValue.h */; };
+               4BAFD0E1219242A000C0AB64 /* CSSUnitValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD0DD2192209200C0AB64 /* CSSUnitValue.h */; };
</ins><span class="cx">           4BD781BF21C1965F00D9703E /* StylePropertyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD781BE21C1965F00D9703E /* StylePropertyMap.h */; };
</span><span class="cx">          4BDA3FFE2151B6F500FD6604 /* DOMCSSCustomPropertyDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDA3FF82151B6F200FD6604 /* DOMCSSCustomPropertyDescriptor.h */; };
</span><span class="cx">          4BDA3FFF2151B6F500FD6604 /* DOMCSSRegisterCustomProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDA3FF92151B6F300FD6604 /* DOMCSSRegisterCustomProperty.h */; };
</span><span class="lines">@@ -8541,8 +8541,8 @@
</span><span class="cx">          4B3043CB0AE0373B00A82647 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
</span><span class="cx">          4B3480910EEF50D400AC1B41 /* ImageSourceCGMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageSourceCGMac.mm; sourceTree = "<group>"; };
</span><span class="cx">          4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSourceCG.h; sourceTree = "<group>"; };
</span><del>-               4B43864D219CD52D00F8D3C5 /* TypedOMCSSImageValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypedOMCSSImageValue.idl; sourceTree = "<group>"; };
-               4B43864F219CD56100F8D3C5 /* TypedOMCSSImageValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypedOMCSSImageValue.h; sourceTree = "<group>"; };
</del><ins>+                4B43864D219CD52D00F8D3C5 /* CSSStyleImageValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSStyleImageValue.idl; sourceTree = "<group>"; };
+               4B43864F219CD56100F8D3C5 /* CSSStyleImageValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSStyleImageValue.h; sourceTree = "<group>"; };
</ins><span class="cx">           4B5BDD99216588E500DD4262 /* CSSPaintCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSPaintCallback.idl; sourceTree = "<group>"; };
</span><span class="cx">          4B5BDD9A21658A1500DD4262 /* CSSPaintCallback.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSPaintCallback.h; sourceTree = "<group>"; };
</span><span class="cx">          4B6B5CB62163DC1A00603817 /* DOMCSSNamespace+CSSPainting.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = "DOMCSSNamespace+CSSPainting.idl"; sourceTree = "<group>"; };
</span><span class="lines">@@ -8561,15 +8561,15 @@
</span><span class="cx">          4BAFD0CD2190EBE900C0AB64 /* CSSPaintSize.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSPaintSize.idl; sourceTree = "<group>"; };
</span><span class="cx">          4BAFD0CE2190F9B400C0AB64 /* StylePropertyMapReadOnly.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StylePropertyMapReadOnly.h; sourceTree = "<group>"; };
</span><span class="cx">          4BAFD0D02190F9C200C0AB64 /* StylePropertyMapReadOnly.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = StylePropertyMapReadOnly.idl; sourceTree = "<group>"; };
</span><del>-               4BAFD0D32192145600C0AB64 /* TypedOMCSSStyleValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypedOMCSSStyleValue.idl; sourceTree = "<group>"; };
-               4BAFD0D52192146B00C0AB64 /* TypedOMCSSStyleValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypedOMCSSStyleValue.h; sourceTree = "<group>"; };
-               4BAFD0D721921E7900C0AB64 /* TypedOMCSSUnparsedValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypedOMCSSUnparsedValue.idl; sourceTree = "<group>"; };
-               4BAFD0D821921EA000C0AB64 /* TypedOMCSSUnparsedValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypedOMCSSUnparsedValue.h; sourceTree = "<group>"; };
-               4BAFD0DB2192202200C0AB64 /* TypedOMCSSNumericValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypedOMCSSNumericValue.idl; sourceTree = "<group>"; };
-               4BAFD0DC2192204A00C0AB64 /* TypedOMCSSUnitValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TypedOMCSSUnitValue.idl; sourceTree = "<group>"; };
-               4BAFD0DD2192209200C0AB64 /* TypedOMCSSUnitValue.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = TypedOMCSSUnitValue.h; sourceTree = "<group>"; };
-               4BAFD0DF219220AB00C0AB64 /* TypedOMCSSNumericValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypedOMCSSNumericValue.h; sourceTree = "<group>"; };
-               4BAFD0E22192604D00C0AB64 /* JSTypedOMCSSStyleValueCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedOMCSSStyleValueCustom.cpp; sourceTree = "<group>"; };
</del><ins>+                4BAFD0D32192145600C0AB64 /* CSSStyleValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSStyleValue.idl; sourceTree = "<group>"; };
+               4BAFD0D52192146B00C0AB64 /* CSSStyleValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSStyleValue.h; sourceTree = "<group>"; };
+               4BAFD0D721921E7900C0AB64 /* CSSUnparsedValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSUnparsedValue.idl; sourceTree = "<group>"; };
+               4BAFD0D821921EA000C0AB64 /* CSSUnparsedValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSUnparsedValue.h; sourceTree = "<group>"; };
+               4BAFD0DB2192202200C0AB64 /* CSSNumericValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSNumericValue.idl; sourceTree = "<group>"; };
+               4BAFD0DC2192204A00C0AB64 /* CSSUnitValue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSUnitValue.idl; sourceTree = "<group>"; };
+               4BAFD0DD2192209200C0AB64 /* CSSUnitValue.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = CSSUnitValue.h; sourceTree = "<group>"; };
+               4BAFD0DF219220AB00C0AB64 /* CSSNumericValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSNumericValue.h; sourceTree = "<group>"; };
+               4BAFD0E22192604D00C0AB64 /* JSCSSStyleValueCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleValueCustom.cpp; sourceTree = "<group>"; };
</ins><span class="cx">           4BD781BC21C1964800D9703E /* StylePropertyMap.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = StylePropertyMap.idl; sourceTree = "<group>"; };
</span><span class="cx">          4BD781BE21C1965F00D9703E /* StylePropertyMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StylePropertyMap.h; sourceTree = "<group>"; };
</span><span class="cx">          4BD781C521C1D67700D9703E /* StylePropertyMapReadOnly.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertyMapReadOnly.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16096,11 +16096,11 @@
</span><span class="cx">          E3150EA51DA7218D00194012 /* DOMJITHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMJITHelpers.h; sourceTree = "<group>"; };
</span><span class="cx">          E31CD750229F749500FBDA19 /* TableLayout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableLayout.cpp; sourceTree = "<group>"; };
</span><span class="cx">          E323CFF91E5AF6A500F0B4A0 /* JSDOMConvertPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMConvertPromise.h; sourceTree = "<group>"; };
</span><del>-               E329275E22543F5700308A9A /* TypedOMCSSStyleValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSStyleValue.cpp; sourceTree = "<group>"; };
-               E329276022543F5800308A9A /* TypedOMCSSImageValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSImageValue.cpp; sourceTree = "<group>"; };
-               E329276122543F5800308A9A /* TypedOMCSSUnparsedValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSUnparsedValue.cpp; sourceTree = "<group>"; };
-               E329276222543F5800308A9A /* TypedOMCSSNumericValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSNumericValue.cpp; sourceTree = "<group>"; };
-               E329276322543F5900308A9A /* TypedOMCSSUnitValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSUnitValue.cpp; sourceTree = "<group>"; };
</del><ins>+                E329275E22543F5700308A9A /* CSSStyleValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSStyleValue.cpp; sourceTree = "<group>"; };
+               E329276022543F5800308A9A /* CSSStyleImageValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSStyleImageValue.cpp; sourceTree = "<group>"; };
+               E329276122543F5800308A9A /* CSSUnparsedValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnparsedValue.cpp; sourceTree = "<group>"; };
+               E329276222543F5800308A9A /* CSSNumericValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSNumericValue.cpp; sourceTree = "<group>"; };
+               E329276322543F5900308A9A /* CSSUnitValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnitValue.cpp; sourceTree = "<group>"; };
</ins><span class="cx">           E329276622543FDE00308A9A /* DOMRectReadOnly.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMRectReadOnly.cpp; sourceTree = "<group>"; };
</span><span class="cx">          E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMJITAbstractHeapRepository.h; path = DerivedSources/WebCore/DOMJITAbstractHeapRepository.h; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx">          E33D0CBC2672E1B30074E183 /* JSDOMGlobalObjectInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSDOMGlobalObjectInlines.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -20080,26 +20080,26 @@
</span><span class="cx">          4BAFD0DA21921EAD00C0AB64 /* typedom */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><ins>+                               E329276222543F5800308A9A /* CSSNumericValue.cpp */,
+                               4BAFD0DF219220AB00C0AB64 /* CSSNumericValue.h */,
+                               4BAFD0DB2192202200C0AB64 /* CSSNumericValue.idl */,
+                               E329276022543F5800308A9A /* CSSStyleImageValue.cpp */,
+                               4B43864F219CD56100F8D3C5 /* CSSStyleImageValue.h */,
+                               4B43864D219CD52D00F8D3C5 /* CSSStyleImageValue.idl */,
+                               E329275E22543F5700308A9A /* CSSStyleValue.cpp */,
+                               4BAFD0D52192146B00C0AB64 /* CSSStyleValue.h */,
+                               4BAFD0D32192145600C0AB64 /* CSSStyleValue.idl */,
+                               E329276322543F5900308A9A /* CSSUnitValue.cpp */,
+                               4BAFD0DD2192209200C0AB64 /* CSSUnitValue.h */,
+                               4BAFD0DC2192204A00C0AB64 /* CSSUnitValue.idl */,
+                               E329276122543F5800308A9A /* CSSUnparsedValue.cpp */,
+                               4BAFD0D821921EA000C0AB64 /* CSSUnparsedValue.h */,
+                               4BAFD0D721921E7900C0AB64 /* CSSUnparsedValue.idl */,
</ins><span class="cx">                           4BD781BE21C1965F00D9703E /* StylePropertyMap.h */,
</span><span class="cx">                          4BD781BC21C1964800D9703E /* StylePropertyMap.idl */,
</span><span class="cx">                          4BD781C521C1D67700D9703E /* StylePropertyMapReadOnly.cpp */,
</span><span class="cx">                          4BAFD0CE2190F9B400C0AB64 /* StylePropertyMapReadOnly.h */,
</span><span class="cx">                          4BAFD0D02190F9C200C0AB64 /* StylePropertyMapReadOnly.idl */,
</span><del>-                               E329276022543F5800308A9A /* TypedOMCSSImageValue.cpp */,
-                               4B43864F219CD56100F8D3C5 /* TypedOMCSSImageValue.h */,
-                               4B43864D219CD52D00F8D3C5 /* TypedOMCSSImageValue.idl */,
-                               E329276222543F5800308A9A /* TypedOMCSSNumericValue.cpp */,
-                               4BAFD0DF219220AB00C0AB64 /* TypedOMCSSNumericValue.h */,
-                               4BAFD0DB2192202200C0AB64 /* TypedOMCSSNumericValue.idl */,
-                               E329275E22543F5700308A9A /* TypedOMCSSStyleValue.cpp */,
-                               4BAFD0D52192146B00C0AB64 /* TypedOMCSSStyleValue.h */,
-                               4BAFD0D32192145600C0AB64 /* TypedOMCSSStyleValue.idl */,
-                               E329276322543F5900308A9A /* TypedOMCSSUnitValue.cpp */,
-                               4BAFD0DD2192209200C0AB64 /* TypedOMCSSUnitValue.h */,
-                               4BAFD0DC2192204A00C0AB64 /* TypedOMCSSUnitValue.idl */,
-                               E329276122543F5800308A9A /* TypedOMCSSUnparsedValue.cpp */,
-                               4BAFD0D821921EA000C0AB64 /* TypedOMCSSUnparsedValue.h */,
-                               4BAFD0D721921E7900C0AB64 /* TypedOMCSSUnparsedValue.idl */,
</del><span class="cx">                   );
</span><span class="cx">                  path = typedom;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="lines">@@ -22626,6 +22626,7 @@
</span><span class="cx">                          9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */,
</span><span class="cx">                          BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
</span><span class="cx">                          AD726FEA16D9F40B003A4E6D /* JSCSSStyleDeclarationCustom.h */,
</span><ins>+                               4BAFD0E22192604D00C0AB64 /* JSCSSStyleValueCustom.cpp */,
</ins><span class="cx">                           BC20FB7E0C0E8E6C00D1447F /* JSDeprecatedCSSOMValueCustom.cpp */,
</span><span class="cx">                          49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */,
</span><span class="cx">                          ADDA94BF19686F8000453029 /* JSDocumentCustom.h */,
</span><span class="lines">@@ -22682,7 +22683,6 @@
</span><span class="cx">                          070334E8145A1F35008D8D45 /* JSTrackCustom.cpp */,
</span><span class="cx">                          07846384145B1B8E00A58DF1 /* JSTrackCustom.h */,
</span><span class="cx">                          516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */,
</span><del>-                               4BAFD0E22192604D00C0AB64 /* JSTypedOMCSSStyleValueCustom.cpp */,
</del><span class="cx">                           F4E1965A21F2395000285078 /* JSUndoItemCustom.cpp */,
</span><span class="cx">                          715DA5D3201BB902002EF2B0 /* JSWebAnimationCustom.cpp */,
</span><span class="cx">                          D3F3D3591A69A3B00059FC2B /* JSWebGL2RenderingContextCustom.cpp */,
</span><span class="lines">@@ -31506,6 +31506,7 @@
</span><span class="cx">                          A80E6D030A1989CA007FB8C5 /* CSSMediaRule.h in Headers */,
</span><span class="cx">                          314BE3A11B30F6B700141982 /* CSSNamedImageValue.h in Headers */,
</span><span class="cx">                          94E839511DFB2A0E007BC6A7 /* CSSNamespaceRule.h in Headers */,
</span><ins>+                               4BAFD0E0219220AB00C0AB64 /* CSSNumericValue.h in Headers */,
</ins><span class="cx">                           A80E6D000A1989CA007FB8C5 /* CSSPageRule.h in Headers */,
</span><span class="cx">                          4B5BDD9B21658A1500DD4262 /* CSSPaintCallback.h in Headers */,
</span><span class="cx">                          4B6E87692176D69200420E5E /* CSSPaintImageValue.h in Headers */,
</span><span class="lines">@@ -31544,8 +31545,10 @@
</span><span class="cx">                          94DE5C8E1D80802700164F2A /* CSSSelectorParser.h in Headers */,
</span><span class="cx">                          A80E6CE80A1989CA007FB8C5 /* CSSShadowValue.h in Headers */,
</span><span class="cx">                          A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */,
</span><ins>+                               4B438650219CD56100F8D3C5 /* CSSStyleImageValue.h in Headers */,
</ins><span class="cx">                           A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
</span><span class="cx">                          A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */,
</span><ins>+                               4BAFD0D62192146B00C0AB64 /* CSSStyleValue.h in Headers */,
</ins><span class="cx">                           94DE5C921D83011D00164F2A /* CSSSupportsParser.h in Headers */,
</span><span class="cx">                          FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */,
</span><span class="cx">                          BC80C9880CD294EE00A0B7B3 /* CSSTimingFunctionValue.h in Headers */,
</span><span class="lines">@@ -31556,7 +31559,9 @@
</span><span class="cx">                          715AD7212050513F00D592DC /* CSSTransition.h in Headers */,
</span><span class="cx">                          371F53E90D2704F900ECE0D5 /* CSSUnicodeRangeValue.h in Headers */,
</span><span class="cx">                          0F6B707A237BC36D0052CA47 /* CSSUnits.h in Headers */,
</span><ins>+                               4BAFD0E1219242A000C0AB64 /* CSSUnitValue.h in Headers */,
</ins><span class="cx">                           DD7CDF250A23CF9800069928 /* CSSUnknownRule.h in Headers */,
</span><ins>+                               4BAFD0D921921EA000C0AB64 /* CSSUnparsedValue.h in Headers */,
</ins><span class="cx">                           BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */,
</span><span class="cx">                          A80E6CEE0A1989CA007FB8C5 /* CSSValue.h in Headers */,
</span><span class="cx">                          E3BBC24723835526006EC39F /* CSSValueKey.h in Headers */,
</span><span class="lines">@@ -35043,11 +35048,6 @@
</span><span class="cx">                          854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
</span><span class="cx">                          C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
</span><span class="cx">                          E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */,
</span><del>-                               4B438650219CD56100F8D3C5 /* TypedOMCSSImageValue.h in Headers */,
-                               4BAFD0E0219220AB00C0AB64 /* TypedOMCSSNumericValue.h in Headers */,
-                               4BAFD0D62192146B00C0AB64 /* TypedOMCSSStyleValue.h in Headers */,
-                               4BAFD0E1219242A000C0AB64 /* TypedOMCSSUnitValue.h in Headers */,
-                               4BAFD0D921921EA000C0AB64 /* TypedOMCSSUnparsedValue.h in Headers */,
</del><span class="cx">                           93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
</span><span class="cx">                          57152B6E21CD995D000C37CA /* U2fCommandConstructor.h in Headers */,
</span><span class="cx">                          57152B7C21DD8BA1000C37CA /* U2fResponseConverter.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleValueCustomcppfromrev280967trunkSourceWebCorebindingsjsJSTypedOMCSSStyleValueCustomcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/bindings/js/JSCSSStyleValueCustom.cpp (from rev 280967, trunk/Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleValueCustom.cpp                               (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleValueCustom.cpp  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2018 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.
+ */
+
+#include "config.h"
+#include "JSCSSStyleValue.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "JSCSSStyleImageValue.h"
+#include "JSCSSUnitValue.h"
+#include "JSCSSUnparsedValue.h"
+#include "JSDOMWrapperCache.h"
+
+namespace WebCore {
+using namespace JSC;
+
+JSValue toJSNewlyCreated(JSGlobalObject*, JSDOMGlobalObject* globalObject, Ref<CSSStyleValue>&& value)
+{
+    if (value->isUnitValue())
+        return createWrapper<CSSUnitValue>(globalObject, WTFMove(value));
+    if (value->isUnparsedValue())
+        return createWrapper<CSSUnparsedValue>(globalObject, WTFMove(value));
+    if (value->isImageValue())
+        return createWrapper<CSSStyleImageValue>(globalObject, WTFMove(value));
+
+    ASSERT_NOT_REACHED();
+    return createWrapper<CSSStyleValue>(globalObject, WTFMove(value));
+}
+
+JSValue toJS(JSGlobalObject* lexicalGlobalObject, JSDOMGlobalObject* globalObject, CSSStyleValue& object)
+{
+    return wrap(lexicalGlobalObject, globalObject, object);
+}
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTypedOMCSSStyleValueCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/bindings/js/JSTypedOMCSSStyleValueCustom.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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.
- */
-
-#include "config.h"
-#include "JSTypedOMCSSStyleValue.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "JSDOMWrapperCache.h"
-#include "JSTypedOMCSSImageValue.h"
-#include "JSTypedOMCSSUnitValue.h"
-#include "JSTypedOMCSSUnparsedValue.h"
-
-namespace WebCore {
-using namespace JSC;
-
-JSValue toJSNewlyCreated(JSGlobalObject*, JSDOMGlobalObject* globalObject, Ref<TypedOMCSSStyleValue>&& value)
-{
-    if (value->isUnitValue())
-        return createWrapper<TypedOMCSSUnitValue>(globalObject, WTFMove(value));
-    if (value->isUnparsedValue())
-        return createWrapper<TypedOMCSSUnparsedValue>(globalObject, WTFMove(value));
-    if (value->isImageValue())
-        return createWrapper<TypedOMCSSImageValue>(globalObject, WTFMove(value));
-
-    ASSERT_NOT_REACHED();
-    return createWrapper<TypedOMCSSStyleValue>(globalObject, WTFMove(value));
-}
-
-JSValue toJS(JSGlobalObject* lexicalGlobalObject, JSDOMGlobalObject* globalObject, TypedOMCSSStyleValue& object)
-{
-    return wrap(lexicalGlobalObject, globalObject, object);
-}
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSNumericValuecppfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnitValuecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSNumericValue.cpp (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSNumericValue.cpp                             (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSNumericValue.cpp        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
+ */
+
+#include "config.h"
+#include "CSSNumericValue.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include <wtf/IsoMallocInlines.h>
+
+namespace WebCore {
+
+WTF_MAKE_ISO_ALLOCATED_IMPL(CSSNumericValue);
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSNumericValuehfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSNumericValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSNumericValue.h (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.h) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSNumericValue.h                               (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSNumericValue.h  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2018 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
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "CSSStyleValue.h"
+
+namespace WebCore {
+
+class CSSNumericValue : public CSSStyleValue {
+    WTF_MAKE_ISO_ALLOCATED(CSSNumericValue);
+protected:
+    CSSNumericValue() = default;
+};
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSNumericValueidlfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSNumericValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSNumericValue.idl (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSNumericValue.idl                             (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSNumericValue.idl        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+/*
+* Copyright (C) 2018 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.
+*/
+
+[
+    InterfaceName=CSSNumericValue,
+    EnabledAtRuntime=CSSTypedOM,
+    Conditional=CSS_TYPED_OM,
+    Exposed=(Window,Worker,PaintWorklet),
+] interface CSSNumericValue : CSSStyleValue {
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleImageValuecppfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSImageValuecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleImageValue.cpp (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleImageValue.cpp                          (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleImageValue.cpp     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
+ */
+
+#include "config.h"
+#include "CSSStyleImageValue.h"
+
+#include "Document.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include <wtf/IsoMallocInlines.h>
+
+namespace WebCore {
+
+WTF_MAKE_ISO_ALLOCATED_IMPL(CSSStyleImageValue);
+
+CSSStyleImageValue::CSSStyleImageValue(CSSImageValue& cssValue, Document& document)
+    : m_cssValue(makeRef(cssValue))
+    , m_document(makeWeakPtr(document))
+{
+}
+
+Document* CSSStyleImageValue::document() const { return m_document.get(); }
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleImageValuehfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSImageValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleImageValue.h (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleImageValue.h                            (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleImageValue.h       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2018 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
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "CSSImageValue.h"
+#include "CSSStyleValue.h"
+#include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
+#include <wtf/text/StringConcatenateNumbers.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class Document;
+
+class CSSStyleImageValue final : public CSSStyleValue {
+    WTF_MAKE_ISO_ALLOCATED(CSSStyleImageValue);
+public:
+    static Ref<CSSStyleImageValue> create(CSSImageValue& cssValue, Document& document)
+    {
+        return adoptRef(*new CSSStyleImageValue(cssValue, document));
+    }
+
+    String toString() final { return m_cssValue->cssText(); }
+
+    CachedImage* image() { return m_cssValue->cachedImage(); }
+    Document* document() const;
+
+private:
+    CSSStyleImageValue(CSSImageValue&, Document&);
+
+    bool isImageValue() final { return true; }
+
+    Ref<CSSImageValue> m_cssValue;
+    WeakPtr<Document> m_document;
+};
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleImageValueidlfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSImageValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleImageValue.idl (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.idl) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleImageValue.idl                          (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleImageValue.idl     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+* Copyright (C) 2018 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.
+*/
+
+[
+    InterfaceName=CSSImageValue,
+    EnabledAtRuntime=CSSTypedOM,
+    Conditional=CSS_TYPED_OM,
+    Exposed=(Window,Worker,PaintWorklet),
+    JSGenerateToNativeObject,
+] interface CSSStyleImageValue : CSSStyleValue {
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleValuecppfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSStyleValuecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleValue.cpp (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleValue.cpp                               (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleValue.cpp  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
+ */
+
+#include "config.h"
+#include "CSSStyleValue.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include <wtf/IsoMallocInlines.h>
+
+namespace WebCore {
+
+WTF_MAKE_ISO_ALLOCATED_IMPL(CSSStyleValue);
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleValuehfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSStyleValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleValue.h (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.h) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleValue.h                         (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleValue.h    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2018 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
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "ScriptWrappable.h"
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class CSSStyleValue : public RefCounted<CSSStyleValue>, public ScriptWrappable {
+    WTF_MAKE_ISO_ALLOCATED(CSSStyleValue);
+public:
+    virtual ~CSSStyleValue() = default;
+    virtual String toString() = 0;
+
+    virtual bool isUnitValue() { return false; }
+    virtual bool isUnparsedValue() { return false; }
+    virtual bool isImageValue() { return false; }
+
+protected:
+    CSSStyleValue() = default;
+};
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSStyleValueidlfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSStyleValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSStyleValue.idl (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSStyleValue.idl                               (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSStyleValue.idl  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+* Copyright (C) 2018 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.
+*/
+
+[
+    InterfaceName=CSSStyleValue,
+    CustomToJSObject,
+    EnabledAtRuntime=CSSTypedOM,
+    Conditional=CSS_TYPED_OM,
+    Exposed=(Window,Worker,PaintWorklet),
+    SkipVTableValidation,
+] interface CSSStyleValue {
+    stringifier;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnitValuecppfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSNumericValuecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp                                (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
+ */
+
+#include "config.h"
+#include "CSSUnitValue.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include <wtf/IsoMallocInlines.h>
+
+namespace WebCore {
+
+WTF_MAKE_ISO_ALLOCATED_IMPL(CSSUnitValue);
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnitValuehfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnitValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnitValue.h (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.h) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnitValue.h                          (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnitValue.h     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2018 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
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "CSSNumericValue.h"
+#include <wtf/RefCounted.h>
+#include <wtf/text/StringConcatenateNumbers.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class CSSUnitValue final : public CSSNumericValue {
+    WTF_MAKE_ISO_ALLOCATED(CSSUnitValue);
+public:
+    static Ref<CSSUnitValue> create(double value, const String& unit)
+    {
+        return adoptRef(*new CSSUnitValue(value, unit));
+    }
+
+    // FIXME: not correct.
+    String toString() final { return makeString((int) m_value, m_unit); }
+
+    double value() const { return m_value; }
+    void setValue(double value) { m_value = value; }
+    const String& unit() const { return m_unit; }
+    void setUnit(const String& unit) { m_unit = unit; }
+
+private:
+    CSSUnitValue(double value, const String& unit)
+        : m_value(value)
+        , m_unit(unit)
+    {
+    }
+
+    bool isUnitValue() final { return true; }
+
+    double m_value;
+    String m_unit;
+};
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnitValueidlfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnitValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnitValue.idl (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnitValue.idl                                (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnitValue.idl   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+* Copyright (C) 2018 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.
+*/
+
+[
+    InterfaceName=CSSUnitValue,
+    EnabledAtRuntime=CSSTypedOM,
+    Conditional=CSS_TYPED_OM,
+    Exposed=(Window,Worker,PaintWorklet),
+] interface CSSUnitValue : CSSNumericValue {
+    constructor(double value, USVString unit);
+
+    attribute double value;
+    readonly attribute USVString unit;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnparsedValuecppfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValuecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnparsedValue.cpp (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnparsedValue.cpp                            (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnparsedValue.cpp       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
+ */
+
+#include "config.h"
+#include "CSSUnparsedValue.h"
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include <wtf/IsoMallocInlines.h>
+
+namespace WebCore {
+
+WTF_MAKE_ISO_ALLOCATED_IMPL(CSSUnparsedValue);
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnparsedValuehfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnparsedValue.h (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnparsedValue.h                              (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnparsedValue.h 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2018 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
+
+#if ENABLE(CSS_TYPED_OM)
+
+#include "CSSStyleValue.h"
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class CSSUnparsedValue final : public CSSStyleValue {
+    WTF_MAKE_ISO_ALLOCATED(CSSUnparsedValue);
+public:
+    static Ref<CSSUnparsedValue> create(const String& serializedValue)
+    {
+        return adoptRef(*new CSSUnparsedValue(serializedValue));
+    }
+
+    String toString() final { return m_serializedValue; }
+
+private:
+    explicit CSSUnparsedValue(const String& serializedValue)
+        : m_serializedValue(serializedValue)
+    {
+    }
+
+    bool isUnparsedValue() final { return true; }
+
+    String m_serializedValue;
+};
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomCSSUnparsedValueidlfromrev280967trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/typedom/CSSUnparsedValue.idl (from rev 280967, trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl) (0 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/CSSUnparsedValue.idl                            (rev 0)
+++ trunk/Source/WebCore/css/typedom/CSSUnparsedValue.idl       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+* Copyright (C) 2018 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.
+*/
+
+// FIXME: wrong constructor.
+[
+    InterfaceName=CSSUnparsedValue,
+    EnabledAtRuntime=CSSTypedOM,
+    Conditional=CSS_TYPED_OM,
+    Exposed=(Window,Worker,PaintWorklet),
+] interface CSSUnparsedValue : CSSStyleValue {
+    constructor(USVString serializedValue);
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecsstypedomStylePropertyMapReadOnlycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.cpp    2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.cpp       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><ins>+#include "CSSStyleImageValue.h"
+#include "CSSStyleValue.h"
+#include "CSSUnitValue.h"
+#include "CSSUnparsedValue.h"
</ins><span class="cx"> #include "Document.h"
</span><del>-#include "TypedOMCSSImageValue.h"
-#include "TypedOMCSSStyleValue.h"
-#include "TypedOMCSSUnitValue.h"
-#include "TypedOMCSSUnparsedValue.h"
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-RefPtr<TypedOMCSSStyleValue> StylePropertyMapReadOnly::reifyValue(CSSValue* value, Document& document, Element*)
</del><ins>+RefPtr<CSSStyleValue> StylePropertyMapReadOnly::reifyValue(CSSValue* value, Document& document, Element*)
</ins><span class="cx"> {
</span><span class="cx">     if (!value)
</span><span class="cx">         return nullptr;
</span><span class="lines">@@ -50,16 +50,16 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: Properly reify all length values.
</span><span class="cx">     if (is<CSSPrimitiveValue>(*value) && downcast<CSSPrimitiveValue>(*value).primitiveType() == CSSUnitType::CSS_PX)
</span><del>-        return TypedOMCSSUnitValue::create(downcast<CSSPrimitiveValue>(*value).doubleValue(), "px");
</del><ins>+        return CSSUnitValue::create(downcast<CSSPrimitiveValue>(*value).doubleValue(), "px");
</ins><span class="cx"> 
</span><span class="cx">     if (is<CSSImageValue>(*value))
</span><del>-        return TypedOMCSSImageValue::create(downcast<CSSImageValue>(*value), document);
</del><ins>+        return CSSStyleImageValue::create(downcast<CSSImageValue>(*value), document);
</ins><span class="cx"> 
</span><del>-    // FIXME: should use raw TypedOMCSSStyleValue
-    return TypedOMCSSUnparsedValue::create(value->cssText());
</del><ins>+    // FIXME: should use raw CSSStyleValue
+    return CSSUnparsedValue::create(value->cssText());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<TypedOMCSSStyleValue> StylePropertyMapReadOnly::customPropertyValueOrDefault(const String& name, Document& document, CSSValue* inputValue, Element* element)
</del><ins>+RefPtr<CSSStyleValue> StylePropertyMapReadOnly::customPropertyValueOrDefault(const String& name, Document& document, CSSValue* inputValue, Element* element)
</ins><span class="cx"> {
</span><span class="cx">     if (!inputValue) {
</span><span class="cx">         auto* registered = document.getCSSRegisteredCustomPropertySet().get(name);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">             return StylePropertyMapReadOnly::reifyValue(value.get(), document, element);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        return TypedOMCSSUnparsedValue::create(emptyString());
</del><ins>+        return CSSUnparsedValue::create(emptyString());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return StylePropertyMapReadOnly::reifyValue(inputValue, document, element);
</span></span></pre></div>
<a id="trunkSourceWebCorecsstypedomStylePropertyMapReadOnlyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.h      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.h 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -36,15 +36,15 @@
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><span class="cx"> class StyledElement;
</span><del>-class TypedOMCSSStyleValue;
</del><ins>+class CSSStyleValue;
</ins><span class="cx"> 
</span><span class="cx"> class StylePropertyMapReadOnly : public RefCounted<StylePropertyMapReadOnly> {
</span><span class="cx"> public:
</span><span class="cx">     virtual ~StylePropertyMapReadOnly() = default;
</span><del>-    virtual RefPtr<TypedOMCSSStyleValue> get(const String& property) const = 0;
</del><ins>+    virtual RefPtr<CSSStyleValue> get(const String& property) const = 0;
</ins><span class="cx"> 
</span><del>-    static RefPtr<TypedOMCSSStyleValue> reifyValue(CSSValue*, Document&, Element* = nullptr);
-    static RefPtr<TypedOMCSSStyleValue> customPropertyValueOrDefault(const String& name, Document&, CSSValue*, Element* = nullptr);
</del><ins>+    static RefPtr<CSSStyleValue> reifyValue(CSSValue*, Document&, Element* = nullptr);
+    static RefPtr<CSSStyleValue> customPropertyValueOrDefault(const String& name, Document&, CSSValue*, Element* = nullptr);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecsstypedomStylePropertyMapReadOnlyidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.idl    2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/StylePropertyMapReadOnly.idl       2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -30,6 +30,6 @@
</span><span class="cx">     SkipVTableValidation,
</span><span class="cx">     JSGenerateToJSObject,
</span><span class="cx"> ] interface StylePropertyMapReadOnly {
</span><del>-    // FIXME: should be (undefined or TypedOMCSSStyleValue), not null
-    TypedOMCSSStyleValue? get(USVString property);
</del><ins>+    // FIXME: should be (undefined or CSSStyleValue), not null
+    CSSStyleValue? get(USVString property);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSImageValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#include "config.h"
-#include "TypedOMCSSImageValue.h"
-
-#include "Document.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSImageValue);
-
-TypedOMCSSImageValue::TypedOMCSSImageValue(CSSImageValue& cssValue, Document& document)
-    : m_cssValue(makeRef(cssValue))
-    , m_document(makeWeakPtr(document))
-{
-}
-
-Document* TypedOMCSSImageValue::document() const { return m_document.get(); }
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSImageValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h  2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "CSSImageValue.h"
-#include "TypedOMCSSStyleValue.h"
-#include <wtf/RefCounted.h>
-#include <wtf/WeakPtr.h>
-#include <wtf/text/StringConcatenateNumbers.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class Document;
-
-class TypedOMCSSImageValue final : public TypedOMCSSStyleValue {
-    WTF_MAKE_ISO_ALLOCATED(TypedOMCSSImageValue);
-public:
-    static Ref<TypedOMCSSImageValue> create(CSSImageValue& cssValue, Document& document)
-    {
-        return adoptRef(*new TypedOMCSSImageValue(cssValue, document));
-    }
-
-    String toString() final { return m_cssValue->cssText(); }
-
-    CachedImage* image() { return m_cssValue->cachedImage(); }
-    Document* document() const;
-
-private:
-    TypedOMCSSImageValue(CSSImageValue& cssValue, Document& document);
-
-    bool isImageValue() final { return true; }
-
-    Ref<CSSImageValue> m_cssValue;
-    WeakPtr<Document> m_document;
-};
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSImageValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.idl        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.idl   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-/*
-* Copyright (C) 2018 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.
-*/
-
-[
-    InterfaceName=CSSImageValue,
-    EnabledAtRuntime=CSSTypedOM,
-    Conditional=CSS_TYPED_OM,
-    Exposed=(Window,Worker,PaintWorklet),
-    JSGenerateToNativeObject,
-] interface TypedOMCSSImageValue : TypedOMCSSStyleValue {
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSNumericValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.cpp 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#include "config.h"
-#include "TypedOMCSSNumericValue.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSNumericValue);
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSNumericValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.h        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.h   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "TypedOMCSSStyleValue.h"
-
-namespace WebCore {
-
-class TypedOMCSSNumericValue : public TypedOMCSSStyleValue {
-    WTF_MAKE_ISO_ALLOCATED(TypedOMCSSNumericValue);
-protected:
-    TypedOMCSSNumericValue() = default;
-};
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSNumericValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSNumericValue.idl 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-/*
-* Copyright (C) 2018 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.
-*/
-
-[
-    InterfaceName=CSSNumericValue,
-    EnabledAtRuntime=CSSTypedOM,
-    Conditional=CSS_TYPED_OM,
-    Exposed=(Window,Worker,PaintWorklet),
-] interface TypedOMCSSNumericValue : TypedOMCSSStyleValue {
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSStyleValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#include "config.h"
-#include "TypedOMCSSStyleValue.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSStyleValue);
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSStyleValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.h  2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.h     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "ScriptWrappable.h"
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class TypedOMCSSStyleValue : public RefCounted<TypedOMCSSStyleValue>, public ScriptWrappable {
-    WTF_MAKE_ISO_ALLOCATED(TypedOMCSSStyleValue);
-public:
-    virtual ~TypedOMCSSStyleValue() = default;
-    virtual String toString() = 0;
-
-    virtual bool isUnitValue() { return false; }
-    virtual bool isUnparsedValue() { return false; }
-    virtual bool isImageValue() { return false; }
-
-protected:
-    TypedOMCSSStyleValue() = default;
-};
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSStyleValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSStyleValue.idl   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
-* Copyright (C) 2018 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.
-*/
-
-[
-    InterfaceName=CSSStyleValue,
-    CustomToJSObject,
-    EnabledAtRuntime=CSSTypedOM,
-    Conditional=CSS_TYPED_OM,
-    Exposed=(Window,Worker,PaintWorklet),
-    SkipVTableValidation,
-] interface TypedOMCSSStyleValue {
-    stringifier;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnitValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp 2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.cpp    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#include "config.h"
-#include "TypedOMCSSUnitValue.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSUnitValue);
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnitValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.h   2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.h      2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "TypedOMCSSNumericValue.h"
-#include <wtf/RefCounted.h>
-#include <wtf/text/StringConcatenateNumbers.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class TypedOMCSSUnitValue final : public TypedOMCSSNumericValue {
-    WTF_MAKE_ISO_ALLOCATED(TypedOMCSSUnitValue);
-public:
-    static Ref<TypedOMCSSUnitValue> create(double value, const String& unit)
-    {
-        return adoptRef(*new TypedOMCSSUnitValue(value, unit));
-    }
-
-    // FIXME: not correct.
-    String toString() final { return makeString((int) m_value, m_unit); }
-
-    double value() const { return m_value; }
-    void setValue(double value) { m_value = value; }
-    const String& unit() const { return m_unit; }
-    void setUnit(const String& unit) { m_unit = unit; }
-
-private:
-    TypedOMCSSUnitValue(double value, const String& unit)
-        : m_value(value)
-        , m_unit(unit)
-    {
-    }
-
-    bool isUnitValue() final { return true; }
-
-    double m_value;
-    String m_unit;
-};
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnitValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl 2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnitValue.idl    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-/*
-* Copyright (C) 2018 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.
-*/
-
-[
-    InterfaceName=CSSUnitValue,
-    EnabledAtRuntime=CSSTypedOM,
-    Conditional=CSS_TYPED_OM,
-    Exposed=(Window,Worker,PaintWorklet),
-] interface TypedOMCSSUnitValue : TypedOMCSSNumericValue {
-    constructor(double value, USVString unit);
-
-    attribute double value;
-    readonly attribute USVString unit;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp     2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.cpp        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#include "config.h"
-#include "TypedOMCSSUnparsedValue.h"
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include <wtf/IsoMallocInlines.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSUnparsedValue);
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h       2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.h  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 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
-
-#if ENABLE(CSS_TYPED_OM)
-
-#include "TypedOMCSSStyleValue.h"
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class TypedOMCSSUnparsedValue final : public TypedOMCSSStyleValue {
-    WTF_MAKE_ISO_ALLOCATED(TypedOMCSSUnparsedValue);
-public:
-    static Ref<TypedOMCSSUnparsedValue> create(const String& serializedValue)
-    {
-        return adoptRef(*new TypedOMCSSUnparsedValue(serializedValue));
-    }
-
-    String toString() final { return m_serializedValue; }
-
-private:
-    explicit TypedOMCSSUnparsedValue(const String& serializedValue)
-        : m_serializedValue(serializedValue)
-    {
-    }
-
-    bool isUnparsedValue() final { return true; }
-
-    String m_serializedValue;
-};
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecsstypedomTypedOMCSSUnparsedValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl     2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSUnparsedValue.idl        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-/*
-* Copyright (C) 2018 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.
-*/
-
-// FIXME: wrong constructor.
-[
-    InterfaceName=CSSUnparsedValue,
-    EnabledAtRuntime=CSSTypedOM,
-    Conditional=CSS_TYPED_OM,
-    Exposed=(Window,Worker,PaintWorklet),
-] interface TypedOMCSSUnparsedValue : TypedOMCSSStyleValue {
-    constructor(USVString serializedValue);
-};
</del></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp       2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/dom/StyledElement.cpp  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSPropertyParser.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><ins>+#include "CSSUnparsedValue.h"
</ins><span class="cx"> #include "CSSValuePool.h"
</span><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="lines">@@ -45,7 +46,6 @@
</span><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include "StylePropertyMap.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><del>-#include "TypedOMCSSUnparsedValue.h"
</del><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> 
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    RefPtr<TypedOMCSSStyleValue> get(const String& property) const final
</del><ins>+    RefPtr<CSSStyleValue> get(const String& property) const final
</ins><span class="cx">     {
</span><span class="cx">         ASSERT(m_element); // Hitting this assertion would imply a GC bug. Element is collected while this property map is alive.
</span><span class="cx">         if (!m_element)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> 
</span><span class="cx">     void clearElement() override { m_element = nullptr; }
</span><span class="cx"> 
</span><del>-    static RefPtr<TypedOMCSSStyleValue> extractInlineProperty(const String& name, StyledElement& element)
</del><ins>+    static RefPtr<CSSStyleValue> extractInlineProperty(const String& name, StyledElement& element)
</ins><span class="cx">     {
</span><span class="cx">         if (!element.inlineStyle())
</span><span class="cx">             return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlCustomPaintImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/CustomPaintImage.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/CustomPaintImage.cpp   2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/CustomPaintImage.cpp      2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSPropertyParser.h"
</span><ins>+#include "CSSStyleImageValue.h"
+#include "CSSUnitValue.h"
+#include "CSSUnparsedValue.h"
</ins><span class="cx"> #include "CustomPaintCanvas.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "ImageBitmap.h"
</span><span class="lines">@@ -41,9 +44,7 @@
</span><span class="cx"> #include "PaintRenderingContext2D.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "StylePropertyMap.h"
</span><del>-#include "TypedOMCSSImageValue.h"
-#include "TypedOMCSSUnitValue.h"
-#include "TypedOMCSSUnparsedValue.h"
</del><ins>+
</ins><span class="cx"> #include <JavaScriptCore/ConstructData.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx"> CustomPaintImage::~CustomPaintImage() = default;
</span><span class="cx"> 
</span><del>-static RefPtr<TypedOMCSSStyleValue> extractComputedProperty(const String& name, Element& element)
</del><ins>+static RefPtr<CSSStyleValue> extractComputedProperty(const String& name, Element& element)
</ins><span class="cx"> {
</span><span class="cx">     ComputedStyleExtractor extractor(&element);
</span><span class="cx"> 
</span><span class="lines">@@ -78,12 +79,12 @@
</span><span class="cx"> 
</span><span class="cx"> class HashMapStylePropertyMap final : public StylePropertyMap {
</span><span class="cx"> public:
</span><del>-    static Ref<StylePropertyMap> create(HashMap<String, RefPtr<TypedOMCSSStyleValue>>&& map)
</del><ins>+    static Ref<StylePropertyMap> create(HashMap<String, RefPtr<CSSStyleValue>>&& map)
</ins><span class="cx">     {
</span><span class="cx">         return adoptRef(*new HashMapStylePropertyMap(WTFMove(map)));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    static RefPtr<TypedOMCSSStyleValue> extractComputedProperty(const String& name, Element& element)
</del><ins>+    static RefPtr<CSSStyleValue> extractComputedProperty(const String& name, Element& element)
</ins><span class="cx">     {
</span><span class="cx">         ComputedStyleExtractor extractor(&element);
</span><span class="cx"> 
</span><span class="lines">@@ -101,7 +102,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    explicit HashMapStylePropertyMap(HashMap<String, RefPtr<TypedOMCSSStyleValue>>&& map)
</del><ins>+    explicit HashMapStylePropertyMap(HashMap<String, RefPtr<CSSStyleValue>>&& map)
</ins><span class="cx">         : m_map(WTFMove(map))
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="lines">@@ -108,9 +109,9 @@
</span><span class="cx"> 
</span><span class="cx">     void clearElement() override { }
</span><span class="cx"> 
</span><del>-    RefPtr<TypedOMCSSStyleValue> get(const String& property) const final { return makeRefPtr(m_map.get(property)); }
</del><ins>+    RefPtr<CSSStyleValue> get(const String& property) const final { return makeRefPtr(m_map.get(property)); }
</ins><span class="cx"> 
</span><del>-    HashMap<String, RefPtr<TypedOMCSSStyleValue>> m_map;
</del><ins>+    HashMap<String, RefPtr<CSSStyleValue>> m_map;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> ImageDrawResult CustomPaintImage::doCustomPaint(GraphicsContext& destContext, const FloatSize& destSize)
</span><span class="lines">@@ -138,7 +139,7 @@
</span><span class="cx">         return ImageDrawResult::DidNothing;
</span><span class="cx">     auto context = contextOrException.releaseReturnValue();
</span><span class="cx"> 
</span><del>-    HashMap<String, RefPtr<TypedOMCSSStyleValue>> propertyValues;
</del><ins>+    HashMap<String, RefPtr<CSSStyleValue>> propertyValues;
</ins><span class="cx"> 
</span><span class="cx">     if (auto* element = m_element->element()) {
</span><span class="cx">         for (auto& name : m_inputProperties)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageBitmap.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageBitmap.cpp        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/ImageBitmap.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "BitmapImage.h"
</span><span class="cx"> #include "Blob.h"
</span><ins>+#include "CSSStyleImageValue.h"
</ins><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ExceptionOr.h"
</span><span class="lines">@@ -51,7 +52,6 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "SuspendableTimer.h"
</span><del>-#include "TypedOMCSSImageValue.h"
</del><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> #include <wtf/Scope.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-void ImageBitmap::createPromise(ScriptExecutionContext&, RefPtr<TypedOMCSSImageValue>&, ImageBitmapOptions&&, std::optional<IntRect>, ImageBitmap::Promise&& promise)
</del><ins>+void ImageBitmap::createPromise(ScriptExecutionContext&, RefPtr<CSSStyleImageValue>&, ImageBitmapOptions&&, std::optional<IntRect>, ImageBitmap::Promise&& promise)
</ins><span class="cx"> {
</span><span class="cx">     promise.reject(InvalidStateError, "Not implemented");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageBitmap.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageBitmap.h  2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/ImageBitmap.h     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> class PendingImageBitmap;
</span><span class="cx"> class ScriptExecutionContext;
</span><del>-class TypedOMCSSImageValue;
</del><ins>+class CSSStyleImageValue;
</ins><span class="cx"> struct ImageBitmapOptions;
</span><span class="cx"> 
</span><span class="cx"> template<typename IDLType> class DOMPromiseDeferred;
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">         RefPtr<OffscreenCanvas>,
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-        RefPtr<TypedOMCSSImageValue>,
</del><ins>+        RefPtr<CSSStyleImageValue>,
</ins><span class="cx"> #endif
</span><span class="cx">         RefPtr<Blob>,
</span><span class="cx">         RefPtr<ImageData>
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">     static void createPromise(ScriptExecutionContext&, CanvasBase&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</span><span class="cx">     static void createPromise(ScriptExecutionContext&, RefPtr<Blob>&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</span><span class="cx">     static void createPromise(ScriptExecutionContext&, RefPtr<ImageData>&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</span><del>-    static void createPromise(ScriptExecutionContext&, RefPtr<TypedOMCSSImageValue>&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</del><ins>+    static void createPromise(ScriptExecutionContext&, RefPtr<CSSStyleImageValue>&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</ins><span class="cx">     static void createFromBuffer(ScriptExecutionContext&, Ref<ArrayBuffer>&&, String mimeType, long long expectedContentLength, const URL&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
</span><span class="cx"> 
</span><span class="cx">     std::optional<ImageBitmapBacking> m_backingStore;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasDrawImageidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasDrawImage.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasDrawImage.idl     2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasDrawImage.idl        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> // FIXME: This should include SVGImageElement.
</span><span class="cx"> typedef (HTMLImageElement or HTMLCanvasElement or ImageBitmap
</span><span class="cx"> #if defined(ENABLE_CSS_TYPED_OM) && ENABLE_CSS_TYPED_OM
</span><del>-    or TypedOMCSSImageValue
</del><ins>+    or CSSStyleImageValue
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_OFFSCREEN_CANVAS) && ENABLE_OFFSCREEN_CANVAS
</span><span class="cx">     or OffscreenCanvas
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasFillStrokeStylesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasFillStrokeStyles.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasFillStrokeStyles.idl      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasFillStrokeStyles.idl 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> // FIXME: This should include SVGImageElement.
</span><span class="cx"> typedef (HTMLImageElement or HTMLCanvasElement or ImageBitmap
</span><span class="cx"> #if defined(ENABLE_CSS_TYPED_OM) && ENABLE_CSS_TYPED_OM
</span><del>-    or TypedOMCSSImageValue
</del><ins>+    or CSSStyleImageValue
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_OFFSCREEN_CANVAS) && ENABLE_OFFSCREEN_CANVAS
</span><span class="cx">     or OffscreenCanvas
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp      2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp 2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">         m_canvas.setOriginTainted();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CanvasRenderingContext::checkOrigin(const TypedOMCSSImageValue&)
</del><ins>+void CanvasRenderingContext::checkOrigin(const CSSStyleImageValue&)
</ins><span class="cx"> {
</span><span class="cx">     m_canvas.setOriginTainted();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> class HTMLImageElement;
</span><span class="cx"> class HTMLVideoElement;
</span><span class="cx"> class ImageBitmap;
</span><del>-class TypedOMCSSImageValue;
</del><ins>+class CSSStyleImageValue;
</ins><span class="cx"> class WebGLObject;
</span><span class="cx"> enum class PixelFormat : uint8_t;
</span><span class="cx"> 
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">             m_canvas.setOriginTainted();
</span><span class="cx">     }
</span><span class="cx">     void checkOrigin(const URL&);
</span><del>-    void checkOrigin(const TypedOMCSSImageValue&);
</del><ins>+    void checkOrigin(const CSSStyleImageValue&);
</ins><span class="cx"> 
</span><span class="cx">     bool m_hasActiveInspectorCanvasCallTracer { false };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp        2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp   2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSStyleImageValue.h"
</ins><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CanvasGradient.h"
</span><span class="cx"> #include "CanvasPattern.h"
</span><span class="lines">@@ -68,7 +69,6 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextMetrics.h"
</span><span class="cx"> #include "TextRun.h"
</span><del>-#include "TypedOMCSSImageValue.h"
</del><span class="cx"> #include <wtf/CheckedArithmetic.h>
</span><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="lines">@@ -1424,7 +1424,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-static inline FloatSize size(TypedOMCSSImageValue& image)
</del><ins>+static inline FloatSize size(CSSStyleImageValue& image)
</ins><span class="cx"> {
</span><span class="cx">     auto* cachedImage = image.image();
</span><span class="cx">     if (!cachedImage)
</span><span class="lines">@@ -1495,7 +1495,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(TypedOMCSSImageValue& image, const FloatRect& srcRect, const FloatRect& dstRect)
</del><ins>+ExceptionOr<void> CanvasRenderingContext2DBase::drawImage(CSSStyleImageValue& image, const FloatRect& srcRect, const FloatRect& dstRect)
</ins><span class="cx"> {
</span><span class="cx">     auto* cachedImage = image.image();
</span><span class="cx">     if (!cachedImage || !image.document())
</span><span class="lines">@@ -2041,7 +2041,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-ExceptionOr<RefPtr<CanvasPattern>> CanvasRenderingContext2DBase::createPattern(TypedOMCSSImageValue&, bool, bool)
</del><ins>+ExceptionOr<RefPtr<CanvasPattern>> CanvasRenderingContext2DBase::createPattern(CSSStyleImageValue&, bool, bool)
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: Implement.
</span><span class="cx">     return Exception { TypeError };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2DBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h  2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.h     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> 
</span><span class="cx"> using CanvasImageSource = Variant<RefPtr<HTMLImageElement>, RefPtr<HTMLCanvasElement>, RefPtr<ImageBitmap>
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-    , RefPtr<TypedOMCSSImageValue>
</del><ins>+    , RefPtr<CSSStyleImageValue>
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(OFFSCREEN_CANVAS)
</span><span class="cx">     , RefPtr<OffscreenCanvas>
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     ExceptionOr<RefPtr<CanvasPattern>> createPattern(ImageBitmap&, bool repeatX, bool repeatY);
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-    ExceptionOr<RefPtr<CanvasPattern>> createPattern(TypedOMCSSImageValue&, bool repeatX, bool repeatY);
</del><ins>+    ExceptionOr<RefPtr<CanvasPattern>> createPattern(CSSStyleImageValue&, bool repeatX, bool repeatY);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     ExceptionOr<void> drawImage(HTMLImageElement&, const FloatRect& srcRect, const FloatRect& dstRect);
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">     ExceptionOr<void> drawImage(HTMLVideoElement&, const FloatRect& srcRect, const FloatRect& dstRect);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-    ExceptionOr<void> drawImage(TypedOMCSSImageValue&, const FloatRect& srcRect, const FloatRect& dstRect);
</del><ins>+    ExceptionOr<void> drawImage(CSSStyleImageValue&, const FloatRect& srcRect, const FloatRect& dstRect);
</ins><span class="cx"> #endif
</span><span class="cx">     ExceptionOr<void> drawImage(ImageBitmap&, const FloatRect& srcRect, const FloatRect& dstRect);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvas.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvas.cpp       2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/inspector/InspectorCanvas.cpp  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "InspectorCanvas.h"
</span><span class="cx"> 
</span><span class="cx"> #include "AffineTransform.h"
</span><ins>+#include "CSSStyleImageValue.h"
</ins><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CanvasBase.h"
</span><span class="cx"> #include "CanvasGradient.h"
</span><span class="lines">@@ -67,7 +68,6 @@
</span><span class="cx"> #include "RecordingSwizzleType.h"
</span><span class="cx"> #include "SVGPathUtilities.h"
</span><span class="cx"> #include "StringAdaptors.h"
</span><del>-#include "TypedOMCSSImageValue.h"
</del><span class="cx"> #include "WebGL2RenderingContext.h"
</span><span class="cx"> #include "WebGLBuffer.h"
</span><span class="cx"> #include "WebGLFramebuffer.h"
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><span class="cx"> 
</span><del>-std::optional<InspectorCanvasCallTracer::ProcessedArgument> InspectorCanvas::processArgument(RefPtr<TypedOMCSSImageValue>& argument)
</del><ins>+std::optional<InspectorCanvasCallTracer::ProcessedArgument> InspectorCanvas::processArgument(RefPtr<CSSStyleImageValue>& argument)
</ins><span class="cx"> {
</span><span class="cx">     if (!argument)
</span><span class="cx">         return std::nullopt;
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx">             item = WTFMove(array);
</span><span class="cx">         },
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-        [&] (const RefPtr<TypedOMCSSImageValue>& cssImageValue) {
</del><ins>+        [&] (const RefPtr<CSSStyleImageValue>& cssImageValue) {
</ins><span class="cx">             String dataURL = "data:,"_s;
</span><span class="cx"> 
</span><span class="cx">             if (auto* cachedImage = cssImageValue->image()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvas.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvas.h 2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/inspector/InspectorCanvas.h    2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class OffscreenCanvas;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-class TypedOMCSSImageValue;
</del><ins>+class CSSStyleImageValue;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> class InspectorCanvas final : public RefCounted<InspectorCanvas> {
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">         RefPtr<ImageBitmap>,
</span><span class="cx">         RefPtr<Inspector::ScriptCallStack>,
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><del>-        RefPtr<TypedOMCSSImageValue>,
</del><ins>+        RefPtr<CSSStyleImageValue>,
</ins><span class="cx"> #endif
</span><span class="cx">         Inspector::ScriptCallFrame,
</span><span class="cx"> #if ENABLE(OFFSCREEN_CANVAS)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasCallTracercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.cpp     2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.cpp        2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorCanvasCallTracer.h"
</span><span class="cx"> 
</span><ins>+#include "CSSStyleImageValue.h"
</ins><span class="cx"> #include "CanvasBase.h"
</span><span class="cx"> #include "CanvasGradient.h"
</span><span class="cx"> #include "CanvasPattern.h"
</span><span class="lines">@@ -44,7 +45,6 @@
</span><span class="cx"> #include "OffscreenCanvas.h"
</span><span class="cx"> #include "Path2D.h"
</span><span class="cx"> #include "RecordingSwizzleType.h"
</span><del>-#include "TypedOMCSSImageValue.h"
</del><span class="cx"> #include "WebGL2RenderingContext.h"
</span><span class="cx"> #include "WebGLBuffer.h"
</span><span class="cx"> #include "WebGLFramebuffer.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasCallTracerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.h (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.h       2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/inspector/InspectorCanvasCallTracer.h  2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> class ImageData;
</span><span class="cx"> class OffscreenCanvas;
</span><span class="cx"> class Path2D;
</span><del>-class TypedOMCSSImageValue;
</del><ins>+class CSSStyleImageValue;
</ins><span class="cx"> class WebGLBuffer;
</span><span class="cx"> class WebGLFramebuffer;
</span><span class="cx"> class WebGLProgram;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TYPED_OM)
</span><span class="cx"> #define FOR_EACH_INSPECTOR_CANVAS_CALL_TRACER_CSS_TYPED_OM_ARGUMENT(macro) \
</span><del>-    macro(RefPtr<TypedOMCSSImageValue>&) \
</del><ins>+    macro(RefPtr<CSSStyleImageValue>&) \
</ins><span class="cx"> // end of FOR_EACH_INSPECTOR_CANVAS_CALL_TRACER_CSS_TYPED_OM_ARGUMENT
</span><span class="cx"> #else
</span><span class="cx"> #define FOR_EACH_INSPECTOR_CANVAS_CALL_TRACER_CSS_TYPED_OM_ARGUMENT(macro)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsInspectorCanvasAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp   2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp      2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorCanvasAgent.h"
</span><span class="cx"> 
</span><ins>+#include "CSSStyleImageValue.h"
</ins><span class="cx"> #include "CanvasBase.h"
</span><span class="cx"> #include "CanvasGradient.h"
</span><span class="cx"> #include "CanvasPattern.h"
</span><span class="lines">@@ -51,7 +52,6 @@
</span><span class="cx"> #include "Path2D.h"
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "StringAdaptors.h"
</span><del>-#include "TypedOMCSSImageValue.h"
</del><span class="cx"> #include "WebGL2RenderingContext.h"
</span><span class="cx"> #include "WebGLBuffer.h"
</span><span class="cx"> #include "WebGLFramebuffer.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepageWindowOrWorkerGlobalScopeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl (280967 => 280968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl  2021-08-12 15:23:37 UTC (rev 280967)
+++ trunk/Source/WebCore/page/WindowOrWorkerGlobalScope.idl     2021-08-12 15:47:18 UTC (rev 280968)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">     or OffscreenCanvas
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_TYPED_OM) && ENABLE_CSS_TYPED_OM
</span><del>-    or TypedOMCSSImageValue
</del><ins>+    or CSSStyleImageValue
</ins><span class="cx"> #endif
</span><span class="cx"> ) CanvasImageSource;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>