<!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>[209969] trunk/Source</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/209969">209969</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-17 12:08:34 -0800 (Sat, 17 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
https://bugs.webkit.org/show_bug.cgi?id=165968
Reviewed by Andreas Kling.
Source/WebCore:
This patch changes the CSS OM for values to use distinct wrapper
classes instead of cloning the existing classes. By actually wrapping
values instead of cloning, we are freed up to change our CSS value hierarchy
however we'd like (such as changing to match the new CSS Values OM that
is coming soon).
All of the CSS Values wrapper classes are prefixed with "DeprecatedCSSOM"
to reflect our desire (ultimately) to remove this API from our tree. We're
the only ones that support it, and it's not used on the Web, but it is part
of the WebKitLegacy API and might be used internally.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/DOMWrapperWorld.h:
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::JSCSSStyleDeclaration::getPropertyCSSValue):
* bindings/js/JSCSSValueCustom.cpp:
(WebCore::JSDeprecatedCSSOMValueOwner::isReachableFromOpaqueRoots):
(WebCore::JSDeprecatedCSSOMValueOwner::finalize):
(WebCore::toJSNewlyCreated):
(WebCore::toJS):
(WebCore::JSCSSValueOwner::isReachableFromOpaqueRoots): Deleted.
(WebCore::JSCSSValueOwner::finalize): Deleted.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSComputedStyleDeclaration.h:
* css/CSSGridLineNamesValue.cpp:
(WebCore::CSSGridLineNamesValue::cloneForCSSOM): Deleted.
* css/CSSGridLineNamesValue.h:
* css/CSSImageSetValue.cpp:
(WebCore::CSSImageSetValue::cloneForCSSOM): Deleted.
* css/CSSImageSetValue.h:
* css/CSSImageValue.cpp:
(WebCore::CSSImageValue::createDeprecatedCSSOMWrapper):
(WebCore::CSSImageValue::cloneForCSSOM): Deleted.
* css/CSSImageValue.h:
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::createDeprecatedCSSOMPrimitiveWrapper):
(WebCore::CSSPrimitiveValue::cloneForCSSOM): Deleted.
* css/CSSPrimitiveValue.h:
* css/CSSPrimitiveValue.idl: Removed.
* css/CSSStyleDeclaration.h:
* css/CSSStyleDeclaration.idl:
* css/CSSValue.cpp:
(WebCore::CSSValue::traverseSubresources):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::createDeprecatedCSSOMWrapper):
(): Deleted.
(WebCore::CSSValue::cloneForCSSOM): Deleted.
* css/CSSValue.h:
(WebCore::CSSValue::CSSValue):
(WebCore::CSSValue::setCssText): Deleted.
(WebCore::CSSValue::isCSSOMSafe): Deleted.
(WebCore::CSSValue::isSubtypeExposedToCSSOM): Deleted.
* css/CSSValue.idl: Removed.
* css/CSSValueList.cpp:
(WebCore::CSSValueList::cloneForCSSOM): Deleted.
* css/CSSValueList.h:
(WebCore::CSSValueList::separator):
* css/CSSValueList.idl: Removed.
* css/Counter.h:
* css/Counter.idl: Removed.
* css/DeprecatedCSSOMCounter.h: Added.
* css/DeprecatedCSSOMCounter.idl: Copied from Source/WebCore/css/Counter.idl.
* css/DeprecatedCSSOMPrimitiveValue.cpp: Added.
(WebCore::DeprecatedCSSOMPrimitiveValue::getCounterValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getRectValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getRGBColorValue):
* css/DeprecatedCSSOMPrimitiveValue.h: Added.
(WebCore::DeprecatedCSSOMPrimitiveValue::create):
(WebCore::DeprecatedCSSOMPrimitiveValue::equals):
(WebCore::DeprecatedCSSOMPrimitiveValue::cssValueType):
(WebCore::DeprecatedCSSOMPrimitiveValue::cssText):
(WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType):
(WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::stringValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::DeprecatedCSSOMPrimitiveValue):
* css/DeprecatedCSSOMPrimitiveValue.idl: Copied from Source/WebCore/css/CSSPrimitiveValue.idl.
* css/DeprecatedCSSOMRGBColor.h: Added.
* css/DeprecatedCSSOMRGBColor.idl: Copied from Source/WebCore/css/RGBColor.idl.
* css/DeprecatedCSSOMRect.h: Added.
* css/DeprecatedCSSOMRect.idl: Copied from Source/WebCore/css/Rect.idl.
* css/DeprecatedCSSOMValue.cpp: Added.
(WebCore::compareCSSOMValues):
(WebCore::DeprecatedCSSOMValue::equals):
(WebCore::DeprecatedCSSOMValue::destroy):
(WebCore::DeprecatedCSSOMValue::cssValueType):
(WebCore::DeprecatedCSSOMValue::cssText):
* css/DeprecatedCSSOMValue.h: Added.
(WebCore::DeprecatedCSSOMValue::deref):
(WebCore::DeprecatedCSSOMValue::setCssText):
(WebCore::DeprecatedCSSOMValue::operator==):
(WebCore::DeprecatedCSSOMValue::isComplexValue):
(WebCore::DeprecatedCSSOMValue::isPrimitiveValue):
(WebCore::DeprecatedCSSOMValue::isValueList):
(WebCore::DeprecatedCSSOMValue::classType):
(WebCore::DeprecatedCSSOMValue::DeprecatedCSSOMValue):
(WebCore::DeprecatedCSSOMValue::~DeprecatedCSSOMValue):
(WebCore::DeprecatedCSSOMComplexValue::create):
(WebCore::DeprecatedCSSOMComplexValue::equals):
(WebCore::DeprecatedCSSOMComplexValue::cssText):
(WebCore::DeprecatedCSSOMComplexValue::cssValueType):
(WebCore::DeprecatedCSSOMComplexValue::DeprecatedCSSOMComplexValue):
* css/DeprecatedCSSOMValue.idl: Copied from Source/WebCore/css/CSSValue.idl.
* css/DeprecatedCSSOMValueList.cpp: Added.
(WebCore::DeprecatedCSSOMValueList::equals):
(WebCore::DeprecatedCSSOMValueList::cssText):
* css/DeprecatedCSSOMValueList.h: Added.
(WebCore::DeprecatedCSSOMValueList::create):
(WebCore::DeprecatedCSSOMValueList::cssValueType):
(WebCore::DeprecatedCSSOMValueList::length):
(WebCore::DeprecatedCSSOMValueList::item):
(WebCore::DeprecatedCSSOMValueList::DeprecatedCSSOMValueList):
* css/DeprecatedCSSOMValueList.idl: Copied from Source/WebCore/css/CSSValueList.idl.
* css/LengthRepeat.h:
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValue):
(WebCore::PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM):
(WebCore::StyleRuleCSSStyleDeclaration::didMutate):
(WebCore::InlineCSSStyleDeclaration::didMutate):
(WebCore::PropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM): Deleted.
* css/PropertySetCSSStyleDeclaration.h:
* css/RGBColor.cpp:
(WebCore::RGBColor::red): Deleted.
(WebCore::RGBColor::green): Deleted.
(WebCore::RGBColor::blue): Deleted.
(WebCore::RGBColor::alpha): Deleted.
* css/RGBColor.h:
* css/RGBColor.idl: Removed.
* css/Rect.h:
(WebCore::RectBase::RectBase):
* css/Rect.idl: Removed.
* svg/SVGElement.cpp:
(WebCore::SVGElement::getPresentationAttribute):
* svg/SVGElement.h:
* svg/SVGElement.idl:
Source/WebKit/mac:
* DOM/DOMCSS.mm:
(kitClass):
* DOM/DOMCSSPrimitiveValue.mm:
(-[DOMCSSPrimitiveValue getCounterValue]):
(-[DOMCSSPrimitiveValue getRectValue]):
(kit):
* DOM/DOMCSSPrimitiveValueInternal.h:
* DOM/DOMCSSStyleDeclaration.mm:
* DOM/DOMCSSValue.mm:
(kit):
* DOM/DOMCSSValueInternal.h:
* DOM/DOMCSSValueList.mm:
* DOM/DOMCounter.mm:
(kit):
* DOM/DOMCounterInternal.h:
* DOM/DOMRGBColor.mm:
(kit):
* DOM/DOMRGBColorInternal.h:
* DOM/DOMRect.mm:
(kit):
* DOM/DOMRectInternal.h:
* DOM/DOMUtility.mm:
(createDOMWrapper):
Source/WebKit2:
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp:
(WebKit::kit):
(WebKit::core):
(WebKit::wrapCSSValue):
(webkit_dom_css_value_constructor):
(webkit_dom_css_value_get_css_text):
(webkit_dom_css_value_set_css_text):
(webkit_dom_css_value_get_css_value_type):
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h:</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="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDOMWrapperWorldh">trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSValueCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSGridLineNamesValuecpp">trunk/Source/WebCore/css/CSSGridLineNamesValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGridLineNamesValueh">trunk/Source/WebCore/css/CSSGridLineNamesValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValueh">trunk/Source/WebCore/css/CSSImageSetValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValuecpp">trunk/Source/WebCore/css/CSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValueh">trunk/Source/WebCore/css/CSSImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleDeclarationh">trunk/Source/WebCore/css/CSSStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleDeclarationidl">trunk/Source/WebCore/css/CSSStyleDeclaration.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListcpp">trunk/Source/WebCore/css/CSSValueList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListh">trunk/Source/WebCore/css/CSSValueList.h</a></li>
<li><a href="#trunkSourceWebCorecssCounterh">trunk/Source/WebCore/css/Counter.h</a></li>
<li><a href="#trunkSourceWebCorecssLengthRepeath">trunk/Source/WebCore/css/LengthRepeat.h</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationh">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssRGBColorcpp">trunk/Source/WebCore/css/RGBColor.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRGBColorh">trunk/Source/WebCore/css/RGBColor.h</a></li>
<li><a href="#trunkSourceWebCorecssRecth">trunk/Source/WebCore/css/Rect.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementidl">trunk/Source/WebCore/svg/SVGElement.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSmm">trunk/Source/WebKit/mac/DOM/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSPrimitiveValuemm">trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValue.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSPrimitiveValueInternalh">trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValueInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSStyleDeclarationmm">trunk/Source/WebKit/mac/DOM/DOMCSSStyleDeclaration.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSValuemm">trunk/Source/WebKit/mac/DOM/DOMCSSValue.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSValueInternalh">trunk/Source/WebKit/mac/DOM/DOMCSSValueInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSValueListmm">trunk/Source/WebKit/mac/DOM/DOMCSSValueList.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCountermm">trunk/Source/WebKit/mac/DOM/DOMCounter.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCounterInternalh">trunk/Source/WebKit/mac/DOM/DOMCounterInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMRGBColormm">trunk/Source/WebKit/mac/DOM/DOMRGBColor.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMRGBColorInternalh">trunk/Source/WebKit/mac/DOM/DOMRGBColorInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMRectmm">trunk/Source/WebKit/mac/DOM/DOMRect.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMRectInternalh">trunk/Source/WebKit/mac/DOM/DOMRectInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMUtilitymm">trunk/Source/WebKit/mac/DOM/DOMUtility.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCSSValuecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCSSValuePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMCounterh">trunk/Source/WebCore/css/DeprecatedCSSOMCounter.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMCounteridl">trunk/Source/WebCore/css/DeprecatedCSSOMCounter.idl</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValuecpp">trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValueh">trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValueidl">trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.idl</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMRGBColorh">trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMRGBColoridl">trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.idl</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMRecth">trunk/Source/WebCore/css/DeprecatedCSSOMRect.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMRectidl">trunk/Source/WebCore/css/DeprecatedCSSOMRect.idl</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValuecpp">trunk/Source/WebCore/css/DeprecatedCSSOMValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValueh">trunk/Source/WebCore/css/DeprecatedCSSOMValue.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValueidl">trunk/Source/WebCore/css/DeprecatedCSSOMValue.idl</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValueListcpp">trunk/Source/WebCore/css/DeprecatedCSSOMValueList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValueListh">trunk/Source/WebCore/css/DeprecatedCSSOMValueList.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedCSSOMValueListidl">trunk/Source/WebCore/css/DeprecatedCSSOMValueList.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueidl">trunk/Source/WebCore/css/CSSPrimitiveValue.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueidl">trunk/Source/WebCore/css/CSSValue.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListidl">trunk/Source/WebCore/css/CSSValueList.idl</a></li>
<li><a href="#trunkSourceWebCorecssCounteridl">trunk/Source/WebCore/css/Counter.idl</a></li>
<li><a href="#trunkSourceWebCorecssRGBColoridl">trunk/Source/WebCore/css/RGBColor.idl</a></li>
<li><a href="#trunkSourceWebCorecssRectidl">trunk/Source/WebCore/css/Rect.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 (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -350,7 +350,6 @@
</span><span class="cx"> css/CSSMediaRule.idl
</span><span class="cx"> css/CSSNamespaceRule.idl
</span><span class="cx"> css/CSSPageRule.idl
</span><del>- css/CSSPrimitiveValue.idl
</del><span class="cx"> css/CSSRule.idl
</span><span class="cx"> css/CSSRuleList.idl
</span><span class="cx"> css/CSSStyleDeclaration.idl
</span><span class="lines">@@ -358,9 +357,12 @@
</span><span class="cx"> css/CSSStyleSheet.idl
</span><span class="cx"> css/CSSSupportsRule.idl
</span><span class="cx"> css/CSSUnknownRule.idl
</span><del>- css/CSSValue.idl
- css/CSSValueList.idl
- css/Counter.idl
</del><ins>+ css/DeprecatedCSSOMCounter.idl
+ css/DeprecatedCSSOMPrimitiveValue.idl
+ css/DeprecatedCSSOMRGBColor.idl
+ css/DeprecatedCSSOMRect.idl
+ css/DeprecatedCSSOMValue.idl
+ css/DeprecatedCSSOMValueList.idl
</ins><span class="cx"> css/DOMCSSNamespace.idl
</span><span class="cx"> css/FontFace.idl
</span><span class="cx"> css/FontFaceSet.idl
</span><span class="lines">@@ -367,8 +369,6 @@
</span><span class="cx"> css/MediaList.idl
</span><span class="cx"> css/MediaQueryList.idl
</span><span class="cx"> css/MediaQueryListListener.idl
</span><del>- css/RGBColor.idl
- css/Rect.idl
</del><span class="cx"> css/StyleMedia.idl
</span><span class="cx"> css/StyleSheet.idl
</span><span class="cx"> css/StyleSheetList.idl
</span><span class="lines">@@ -1329,6 +1329,9 @@
</span><span class="cx"> css/CSSVariableData.cpp
</span><span class="cx"> css/CSSVariableReferenceValue.cpp
</span><span class="cx"> css/DOMCSSNamespace.cpp
</span><ins>+ css/DeprecatedCSSOMPrimitiveValue.cpp
+ css/DeprecatedCSSOMValue.cpp
+ css/DeprecatedCSSOMValueList.cpp
</ins><span class="cx"> css/DocumentRuleSets.cpp
</span><span class="cx"> css/ElementRuleCollector.cpp
</span><span class="cx"> css/FontVariantBuilder.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/ChangeLog 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,3 +1,154 @@
</span><ins>+2016-12-16 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
+ https://bugs.webkit.org/show_bug.cgi?id=165968
+
+ Reviewed by Andreas Kling.
+
+ This patch changes the CSS OM for values to use distinct wrapper
+ classes instead of cloning the existing classes. By actually wrapping
+ values instead of cloning, we are freed up to change our CSS value hierarchy
+ however we'd like (such as changing to match the new CSS Values OM that
+ is coming soon).
+
+ All of the CSS Values wrapper classes are prefixed with "DeprecatedCSSOM"
+ to reflect our desire (ultimately) to remove this API from our tree. We're
+ the only ones that support it, and it's not used on the Web, but it is part
+ of the WebKitLegacy API and might be used internally.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/DOMWrapperWorld.h:
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::JSCSSStyleDeclaration::getPropertyCSSValue):
+ * bindings/js/JSCSSValueCustom.cpp:
+ (WebCore::JSDeprecatedCSSOMValueOwner::isReachableFromOpaqueRoots):
+ (WebCore::JSDeprecatedCSSOMValueOwner::finalize):
+ (WebCore::toJSNewlyCreated):
+ (WebCore::toJS):
+ (WebCore::JSCSSValueOwner::isReachableFromOpaqueRoots): Deleted.
+ (WebCore::JSCSSValueOwner::finalize): Deleted.
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSComputedStyleDeclaration.h:
+ * css/CSSGridLineNamesValue.cpp:
+ (WebCore::CSSGridLineNamesValue::cloneForCSSOM): Deleted.
+ * css/CSSGridLineNamesValue.h:
+ * css/CSSImageSetValue.cpp:
+ (WebCore::CSSImageSetValue::cloneForCSSOM): Deleted.
+ * css/CSSImageSetValue.h:
+ * css/CSSImageValue.cpp:
+ (WebCore::CSSImageValue::createDeprecatedCSSOMWrapper):
+ (WebCore::CSSImageValue::cloneForCSSOM): Deleted.
+ * css/CSSImageValue.h:
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::createDeprecatedCSSOMPrimitiveWrapper):
+ (WebCore::CSSPrimitiveValue::cloneForCSSOM): Deleted.
+ * css/CSSPrimitiveValue.h:
+ * css/CSSPrimitiveValue.idl: Removed.
+ * css/CSSStyleDeclaration.h:
+ * css/CSSStyleDeclaration.idl:
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::traverseSubresources):
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ (WebCore::CSSValue::createDeprecatedCSSOMWrapper):
+ (): Deleted.
+ (WebCore::CSSValue::cloneForCSSOM): Deleted.
+ * css/CSSValue.h:
+ (WebCore::CSSValue::CSSValue):
+ (WebCore::CSSValue::setCssText): Deleted.
+ (WebCore::CSSValue::isCSSOMSafe): Deleted.
+ (WebCore::CSSValue::isSubtypeExposedToCSSOM): Deleted.
+ * css/CSSValue.idl: Removed.
+ * css/CSSValueList.cpp:
+ (WebCore::CSSValueList::cloneForCSSOM): Deleted.
+ * css/CSSValueList.h:
+ (WebCore::CSSValueList::separator):
+ * css/CSSValueList.idl: Removed.
+ * css/Counter.h:
+ * css/Counter.idl: Removed.
+ * css/DeprecatedCSSOMCounter.h: Added.
+ * css/DeprecatedCSSOMCounter.idl: Copied from Source/WebCore/css/Counter.idl.
+ * css/DeprecatedCSSOMPrimitiveValue.cpp: Added.
+ (WebCore::DeprecatedCSSOMPrimitiveValue::getCounterValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::getRectValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::getRGBColorValue):
+ * css/DeprecatedCSSOMPrimitiveValue.h: Added.
+ (WebCore::DeprecatedCSSOMPrimitiveValue::create):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::equals):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::cssValueType):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::cssText):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::stringValue):
+ (WebCore::DeprecatedCSSOMPrimitiveValue::DeprecatedCSSOMPrimitiveValue):
+ * css/DeprecatedCSSOMPrimitiveValue.idl: Copied from Source/WebCore/css/CSSPrimitiveValue.idl.
+ * css/DeprecatedCSSOMRGBColor.h: Added.
+ * css/DeprecatedCSSOMRGBColor.idl: Copied from Source/WebCore/css/RGBColor.idl.
+ * css/DeprecatedCSSOMRect.h: Added.
+ * css/DeprecatedCSSOMRect.idl: Copied from Source/WebCore/css/Rect.idl.
+ * css/DeprecatedCSSOMValue.cpp: Added.
+ (WebCore::compareCSSOMValues):
+ (WebCore::DeprecatedCSSOMValue::equals):
+ (WebCore::DeprecatedCSSOMValue::destroy):
+ (WebCore::DeprecatedCSSOMValue::cssValueType):
+ (WebCore::DeprecatedCSSOMValue::cssText):
+ * css/DeprecatedCSSOMValue.h: Added.
+ (WebCore::DeprecatedCSSOMValue::deref):
+ (WebCore::DeprecatedCSSOMValue::setCssText):
+ (WebCore::DeprecatedCSSOMValue::operator==):
+ (WebCore::DeprecatedCSSOMValue::isComplexValue):
+ (WebCore::DeprecatedCSSOMValue::isPrimitiveValue):
+ (WebCore::DeprecatedCSSOMValue::isValueList):
+ (WebCore::DeprecatedCSSOMValue::classType):
+ (WebCore::DeprecatedCSSOMValue::DeprecatedCSSOMValue):
+ (WebCore::DeprecatedCSSOMValue::~DeprecatedCSSOMValue):
+ (WebCore::DeprecatedCSSOMComplexValue::create):
+ (WebCore::DeprecatedCSSOMComplexValue::equals):
+ (WebCore::DeprecatedCSSOMComplexValue::cssText):
+ (WebCore::DeprecatedCSSOMComplexValue::cssValueType):
+ (WebCore::DeprecatedCSSOMComplexValue::DeprecatedCSSOMComplexValue):
+ * css/DeprecatedCSSOMValue.idl: Copied from Source/WebCore/css/CSSValue.idl.
+ * css/DeprecatedCSSOMValueList.cpp: Added.
+ (WebCore::DeprecatedCSSOMValueList::equals):
+ (WebCore::DeprecatedCSSOMValueList::cssText):
+ * css/DeprecatedCSSOMValueList.h: Added.
+ (WebCore::DeprecatedCSSOMValueList::create):
+ (WebCore::DeprecatedCSSOMValueList::cssValueType):
+ (WebCore::DeprecatedCSSOMValueList::length):
+ (WebCore::DeprecatedCSSOMValueList::item):
+ (WebCore::DeprecatedCSSOMValueList::DeprecatedCSSOMValueList):
+ * css/DeprecatedCSSOMValueList.idl: Copied from Source/WebCore/css/CSSValueList.idl.
+ * css/LengthRepeat.h:
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValue):
+ (WebCore::PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM):
+ (WebCore::StyleRuleCSSStyleDeclaration::didMutate):
+ (WebCore::InlineCSSStyleDeclaration::didMutate):
+ (WebCore::PropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM): Deleted.
+ * css/PropertySetCSSStyleDeclaration.h:
+ * css/RGBColor.cpp:
+ (WebCore::RGBColor::red): Deleted.
+ (WebCore::RGBColor::green): Deleted.
+ (WebCore::RGBColor::blue): Deleted.
+ (WebCore::RGBColor::alpha): Deleted.
+ * css/RGBColor.h:
+ * css/RGBColor.idl: Removed.
+ * css/Rect.h:
+ (WebCore::RectBase::RectBase):
+ * css/Rect.idl: Removed.
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::getPresentationAttribute):
+ * svg/SVGElement.h:
+ * svg/SVGElement.idl:
+
</ins><span class="cx"> 2016-12-17 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rollout r209860 OWR player shouldn't be selected for normal video playback
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> #include "JSComment.cpp"
</span><span class="cx"> #include "JSCompositionEvent.cpp"
</span><span class="cx"> #include "JSCoordinates.cpp"
</span><del>-#include "JSCounter.cpp"
</del><span class="cx"> #include "JSCrypto.cpp"
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> #include "JSCSSFontFaceLoadEvent.cpp"
</span><span class="lines">@@ -127,7 +126,6 @@
</span><span class="cx"> #include "JSCSSKeyframesRule.cpp"
</span><span class="cx"> #include "JSCSSMediaRule.cpp"
</span><span class="cx"> #include "JSCSSPageRule.cpp"
</span><del>-#include "JSCSSPrimitiveValue.cpp"
</del><span class="cx"> #include "JSCSSRule.cpp"
</span><span class="cx"> #include "JSCSSRuleList.cpp"
</span><span class="cx"> #include "JSCSSStyleDeclaration.cpp"
</span><span class="lines">@@ -135,8 +133,6 @@
</span><span class="cx"> #include "JSCSSStyleSheet.cpp"
</span><span class="cx"> #include "JSCSSSupportsRule.cpp"
</span><span class="cx"> #include "JSCSSUnknownRule.cpp"
</span><del>-#include "JSCSSValue.cpp"
-#include "JSCSSValueList.cpp"
</del><span class="cx"> #include "JSClipboardEvent.cpp"
</span><span class="cx"> #include "JSCustomElementRegistry.cpp"
</span><span class="cx"> #include "JSCustomEvent.cpp"
</span><span class="lines">@@ -149,6 +145,12 @@
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> #include "JSDelayNode.cpp"
</span><span class="cx"> #endif
</span><ins>+#include "JSDeprecatedCSSOMCounter.cpp"
+#include "JSDeprecatedCSSOMPrimitiveValue.cpp"
+#include "JSDeprecatedCSSOMRGBColor.cpp"
+#include "JSDeprecatedCSSOMRect.cpp"
+#include "JSDeprecatedCSSOMValue.cpp"
+#include "JSDeprecatedCSSOMValueList.cpp"
</ins><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span><span class="cx"> #include "JSDeviceMotionEvent.h"
</span><span class="cx"> #include "JSDeviceOrientationEvent.cpp"
</span><span class="lines">@@ -401,9 +403,7 @@
</span><span class="cx"> #include "JSReadableStream.cpp"
</span><span class="cx"> #include "JSReadableStreamDefaultController.cpp"
</span><span class="cx"> #include "JSReadableStreamDefaultReader.cpp"
</span><del>-#include "JSRect.cpp"
</del><span class="cx"> #include "JSRequestAnimationFrameCallback.cpp"
</span><del>-#include "JSRGBColor.cpp"
</del><span class="cx"> #include "JSRTCConfiguration.cpp"
</span><span class="cx"> #include "JSRTCDataChannel.cpp"
</span><span class="cx"> #include "JSRTCDataChannelEvent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/DerivedSources.make 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -282,7 +282,6 @@
</span><span class="cx"> $(WebCore)/css/CSSMediaRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSNamespaceRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSPageRule.idl \
</span><del>- $(WebCore)/css/CSSPrimitiveValue.idl \
</del><span class="cx"> $(WebCore)/css/CSSRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSRuleList.idl \
</span><span class="cx"> $(WebCore)/css/CSSStyleDeclaration.idl \
</span><span class="lines">@@ -290,9 +289,12 @@
</span><span class="cx"> $(WebCore)/css/CSSStyleSheet.idl \
</span><span class="cx"> $(WebCore)/css/CSSSupportsRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSUnknownRule.idl \
</span><del>- $(WebCore)/css/CSSValue.idl \
- $(WebCore)/css/CSSValueList.idl \
- $(WebCore)/css/Counter.idl \
</del><ins>+ $(WebCore)/css/DeprecatedCSSOMCounter.idl \
+ $(WebCore)/css/DeprecatedCSSOMPrimitiveValue.idl \
+ $(WebCore)/css/DeprecatedCSSOMRGBColor.idl \
+ $(WebCore)/css/DeprecatedCSSOMRect.idl \
+ $(WebCore)/css/DeprecatedCSSOMValue.idl \
+ $(WebCore)/css/DeprecatedCSSOMValueList.idl \
</ins><span class="cx"> $(WebCore)/css/DOMCSSNamespace.idl \
</span><span class="cx"> $(WebCore)/css/FontFace.idl \
</span><span class="cx"> $(WebCore)/css/FontFaceSet.idl \
</span><span class="lines">@@ -299,8 +301,6 @@
</span><span class="cx"> $(WebCore)/css/MediaList.idl \
</span><span class="cx"> $(WebCore)/css/MediaQueryList.idl \
</span><span class="cx"> $(WebCore)/css/MediaQueryListListener.idl \
</span><del>- $(WebCore)/css/RGBColor.idl \
- $(WebCore)/css/Rect.idl \
</del><span class="cx"> $(WebCore)/css/StyleMedia.idl \
</span><span class="cx"> $(WebCore)/css/StyleSheet.idl \
</span><span class="cx"> $(WebCore)/css/StyleSheetList.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -629,8 +629,6 @@
</span><span class="cx"> 14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14993BE30B2F2B1C0050497F /* FocusController.cpp */; };
</span><span class="cx"> 14993BE60B2F2B1C0050497F /* FocusController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14993BE40B2F2B1C0050497F /* FocusController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14C9A5EA0B3D105F005A0232 /* Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14C9A5E90B3D105F005A0232 /* Settings.cpp */; };
</span><del>- 14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */; };
- 14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14CF78A509F58CD800EB3665 /* JSCSSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 14CF7B3309F6ECD700EB3665 /* JSCSSRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14CF7B3109F6ECD700EB3665 /* JSCSSRule.cpp */; };
</span><span class="cx"> 14CF7B3409F6ECD700EB3665 /* JSCSSRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14D64B5C134A5B6B00E58FDA /* TreeScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14D64B5A134A5B6B00E58FDA /* TreeScope.cpp */; };
</span><span class="lines">@@ -3241,10 +3239,6 @@
</span><span class="cx"> 9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
</span><span class="cx"> 9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 930705D809E0C9B700B17FE4 /* JSCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 930705D709E0C9B700B17FE4 /* JSCounter.cpp */; };
- 930705DA09E0C9BF00B17FE4 /* JSCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 930705D909E0C9BF00B17FE4 /* JSCounter.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 930705E909E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */; };
- 930705EB09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */; };
</del><span class="cx"> 9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */; };
</span><span class="cx"> 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 9307F1D60AF2D59000DBA31A /* HitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 930841341CDDB15500B0958C /* JSDOMConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 930841331CDDB15500B0958C /* JSDOMConvert.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3540,6 +3534,27 @@
</span><span class="cx"> 946D374A1D6D06280077084F /* CSSMarkup.h in Headers */ = {isa = PBXBuildFile; fileRef = 946D37481D6D060C0077084F /* CSSMarkup.h */; };
</span><span class="cx"> 946D374D1D6D08A60077084F /* CSSParserTokenRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 946D374B1D6D07F50077084F /* CSSParserTokenRange.cpp */; };
</span><span class="cx"> 946D374E1D6D08AA0077084F /* CSSParserTokenRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 946D374C1D6D07F50077084F /* CSSParserTokenRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 947949241E0308A400018D85 /* DeprecatedCSSOMValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 947949221E02F90B00018D85 /* DeprecatedCSSOMValue.cpp */; };
+ 947949251E0308AF00018D85 /* DeprecatedCSSOMValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949231E02F90B00018D85 /* DeprecatedCSSOMValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9479492E1E0457BA00018D85 /* DeprecatedCSSOMValueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479492D1E04578D00018D85 /* DeprecatedCSSOMValueList.cpp */; };
+ 9479492F1E0459EB00018D85 /* JSDeprecatedCSSOMCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 947949181E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.cpp */; };
+ 947949301E0459EE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479491A1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.cpp */; };
+ 947949311E0459FA00018D85 /* JSDeprecatedCSSOMCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949191E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949321E0459FA00018D85 /* JSDeprecatedCSSOMPrimitiveValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9479491B1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949331E0459FA00018D85 /* JSDeprecatedCSSOMRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479491C1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.cpp */; };
+ 947949341E0459FA00018D85 /* JSDeprecatedCSSOMRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 9479491D1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949351E0459FA00018D85 /* JSDeprecatedCSSOMRGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479491E1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.cpp */; };
+ 947949361E0459FA00018D85 /* JSDeprecatedCSSOMRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9479491F1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949371E0459FA00018D85 /* JSDeprecatedCSSOMValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 947949201E02F6DE00018D85 /* JSDeprecatedCSSOMValue.cpp */; };
+ 947949381E0459FA00018D85 /* JSDeprecatedCSSOMValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949211E02F6DE00018D85 /* JSDeprecatedCSSOMValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949391E0459FA00018D85 /* JSDeprecatedCSSOMValueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479492B1E033B2800018D85 /* JSDeprecatedCSSOMValueList.cpp */; };
+ 9479493A1E0459FA00018D85 /* JSDeprecatedCSSOMValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9479492C1E033B2800018D85 /* JSDeprecatedCSSOMValueList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9479493C1E045CF300018D85 /* DeprecatedCSSOMPrimitiveValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9479493B1E045CE100018D85 /* DeprecatedCSSOMPrimitiveValue.cpp */; };
+ 9479493D1E0463B600018D85 /* DeprecatedCSSOMValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949271E03132000018D85 /* DeprecatedCSSOMValueList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9479493E1E0463BE00018D85 /* DeprecatedCSSOMRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949291E032D5800018D85 /* DeprecatedCSSOMRGBColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9479493F1E0463C600018D85 /* DeprecatedCSSOMRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949281E032AE900018D85 /* DeprecatedCSSOMRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949401E0463CE00018D85 /* DeprecatedCSSOMPrimitiveValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 947949261E03132000018D85 /* DeprecatedCSSOMPrimitiveValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 947949411E0463D400018D85 /* DeprecatedCSSOMCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9479492A1E032EDB00018D85 /* DeprecatedCSSOMCounter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9493B6BE1D74B4120088E780 /* MediaQueryBlockWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9493B6B61D74B3950088E780 /* MediaQueryBlockWatcher.cpp */; };
</span><span class="cx"> 9493B6BF1D74B4120088E780 /* MediaQueryBlockWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9493B6B71D74B3950088E780 /* MediaQueryBlockWatcher.h */; };
</span><span class="cx"> 9493B6C01D74B4120088E780 /* MediaQueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9493B6B81D74B3950088E780 /* MediaQueryParser.cpp */; };
</span><span class="lines">@@ -4353,8 +4368,6 @@
</span><span class="cx"> A8CFF7AB0A156978000A4234 /* HTMLAnchorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CFF7A10A156978000A4234 /* HTMLAnchorElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A8D05FA70A23B301005E7203 /* JSCSSRuleList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8D05FA50A23B301005E7203 /* JSCSSRuleList.cpp */; };
</span><span class="cx"> A8D05FA80A23B301005E7203 /* JSCSSRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8D05FA60A23B301005E7203 /* JSCSSRuleList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */; };
- A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */; };
</del><span class="cx"> A8D064FB0A23C0CC005E7203 /* JSHTMLFormElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8D064F90A23C0CC005E7203 /* JSHTMLFormElement.cpp */; };
</span><span class="cx"> A8D064FC0A23C0CC005E7203 /* JSHTMLFormElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8D064FA0A23C0CC005E7203 /* JSHTMLFormElement.h */; };
</span><span class="cx"> A8D065AE0A2446CD005E7203 /* JSHTMLFormElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8D065AD0A2446CD005E7203 /* JSHTMLFormElementCustom.cpp */; };
</span><span class="lines">@@ -5342,8 +5355,6 @@
</span><span class="cx"> BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6D6E2509AF943500F59759 /* ScrollView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC74DA371013F3F7007987AD /* RGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC74DA351013F3F7007987AD /* RGBColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC74DA381013F3F7007987AD /* RGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC74DA361013F3F7007987AD /* RGBColor.cpp */; };
</span><del>- BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC74DA461013F468007987AD /* JSRGBColor.cpp */; };
- BC74DA491013F468007987AD /* JSRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC74DA471013F468007987AD /* JSRGBColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> BC76AC130DD7AD5C00415F34 /* ParserUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */; };
</span><span class="cx"> BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772B360C4EA91E0083285F /* CSSHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */; };
</span><span class="lines">@@ -5562,8 +5573,6 @@
</span><span class="cx"> BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFA930710333193007B25D1 /* RenderOverflow.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFE2F0F0C1B58370020235F /* JSRect.cpp */; };
- BCFE2F120C1B58380020235F /* JSRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFE2F100C1B58370020235F /* JSRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCFF64920EAD15C200C1D6F7 /* LengthSize.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFF64900EAD15C200C1D6F7 /* LengthSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE16C58E17CFE17200852C04 /* InbandGenericTextTrack.cpp */; };
</span><span class="lines">@@ -7658,9 +7667,7 @@
</span><span class="cx"> 14A98E05136386A200C9FED2 /* Blob.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Blob.idl; sourceTree = "<group>"; };
</span><span class="cx"> 14BDF59A1365399100148393 /* FileReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FileReader.idl; sourceTree = "<group>"; };
</span><span class="cx"> 14C9A5E90B3D105F005A0232 /* Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = "<group>"; };
</span><del>- 14CF787109F587CA00EB3665 /* CSSValue.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValue.idl; sourceTree = "<group>"; };
- 14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSValue.cpp; sourceTree = "<group>"; };
- 14CF78A509F58CD800EB3665 /* JSCSSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSValue.h; sourceTree = "<group>"; };
</del><ins>+ 14CF787109F587CA00EB3665 /* DeprecatedCSSOMValue.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DeprecatedCSSOMValue.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 14CF7A7009F5CF9A00EB3665 /* CSSRule.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSRule.idl; sourceTree = "<group>"; };
</span><span class="cx"> 14CF7B3109F6ECD700EB3665 /* JSCSSRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSRule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSRule.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10738,7 +10745,7 @@
</span><span class="cx"> 8574D1F60ADE6122004CBA11 /* JSSVGPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = JSSVGPoint.h; sourceTree = "<group>"; };
</span><span class="cx"> 8574D1F70ADE6122004CBA11 /* JSSVGRect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGRect.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 8574D1F80ADE6122004CBA11 /* JSSVGRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = JSSVGRect.h; sourceTree = "<group>"; };
</span><del>- 858C38EF0AA8FDD100B187A4 /* RGBColor.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = RGBColor.idl; sourceTree = "<group>"; };
</del><ins>+ 858C38EF0AA8FDD100B187A4 /* DeprecatedCSSOMRGBColor.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DeprecatedCSSOMRGBColor.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 858C39100AA8FF0000B187A4 /* CSSStyleSheet.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSStyleSheet.idl; sourceTree = "<group>"; };
</span><span class="cx"> 859128790AB222EC00202265 /* HTMLEmbedElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLEmbedElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 85ACA9F90A9B631000671E90 /* NamedNodeMap.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = NamedNodeMap.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -10831,12 +10838,8 @@
</span><span class="cx"> 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
</span><span class="cx"> 9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
</span><del>- 9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSPrimitiveValue.idl; sourceTree = "<group>"; };
- 930705C709E0C95F00B17FE4 /* Counter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Counter.idl; sourceTree = "<group>"; };
- 930705D709E0C9B700B17FE4 /* JSCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCounter.cpp; sourceTree = "<group>"; };
- 930705D909E0C9BF00B17FE4 /* JSCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCounter.h; sourceTree = "<group>"; };
- 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSPrimitiveValue.cpp; sourceTree = "<group>"; };
- 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSPrimitiveValue.h; sourceTree = "<group>"; };
</del><ins>+ 9307059009E0C75800B17FE4 /* DeprecatedCSSOMPrimitiveValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedCSSOMPrimitiveValue.idl; sourceTree = "<group>"; };
+ 930705C709E0C95F00B17FE4 /* DeprecatedCSSOMCounter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedCSSOMCounter.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
</span><span class="cx"> 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9307F1D60AF2D59000DBA31A /* HitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestResult.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -11136,6 +11139,27 @@
</span><span class="cx"> 946D37481D6D060C0077084F /* CSSMarkup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSMarkup.h; sourceTree = "<group>"; };
</span><span class="cx"> 946D374B1D6D07F50077084F /* CSSParserTokenRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSParserTokenRange.cpp; path = parser/CSSParserTokenRange.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 946D374C1D6D07F50077084F /* CSSParserTokenRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSParserTokenRange.h; path = parser/CSSParserTokenRange.h; sourceTree = "<group>"; };
</span><ins>+ 947949181E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMCounter.cpp; sourceTree = "<group>"; };
+ 947949191E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMCounter.h; sourceTree = "<group>"; };
+ 9479491A1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMPrimitiveValue.cpp; sourceTree = "<group>"; };
+ 9479491B1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMPrimitiveValue.h; sourceTree = "<group>"; };
+ 9479491C1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMRect.cpp; sourceTree = "<group>"; };
+ 9479491D1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMRect.h; sourceTree = "<group>"; };
+ 9479491E1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMRGBColor.cpp; sourceTree = "<group>"; };
+ 9479491F1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMRGBColor.h; sourceTree = "<group>"; };
+ 947949201E02F6DE00018D85 /* JSDeprecatedCSSOMValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMValue.cpp; sourceTree = "<group>"; };
+ 947949211E02F6DE00018D85 /* JSDeprecatedCSSOMValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMValue.h; sourceTree = "<group>"; };
+ 947949221E02F90B00018D85 /* DeprecatedCSSOMValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCSSOMValue.cpp; sourceTree = "<group>"; };
+ 947949231E02F90B00018D85 /* DeprecatedCSSOMValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMValue.h; sourceTree = "<group>"; };
+ 947949261E03132000018D85 /* DeprecatedCSSOMPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMPrimitiveValue.h; sourceTree = "<group>"; };
+ 947949271E03132000018D85 /* DeprecatedCSSOMValueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMValueList.h; sourceTree = "<group>"; };
+ 947949281E032AE900018D85 /* DeprecatedCSSOMRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMRect.h; sourceTree = "<group>"; };
+ 947949291E032D5800018D85 /* DeprecatedCSSOMRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMRGBColor.h; sourceTree = "<group>"; };
+ 9479492A1E032EDB00018D85 /* DeprecatedCSSOMCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCSSOMCounter.h; sourceTree = "<group>"; };
+ 9479492B1E033B2800018D85 /* JSDeprecatedCSSOMValueList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeprecatedCSSOMValueList.cpp; sourceTree = "<group>"; };
+ 9479492C1E033B2800018D85 /* JSDeprecatedCSSOMValueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeprecatedCSSOMValueList.h; sourceTree = "<group>"; };
+ 9479492D1E04578D00018D85 /* DeprecatedCSSOMValueList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCSSOMValueList.cpp; sourceTree = "<group>"; };
+ 9479493B1E045CE100018D85 /* DeprecatedCSSOMPrimitiveValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCSSOMPrimitiveValue.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 9493B6B61D74B3950088E780 /* MediaQueryBlockWatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaQueryBlockWatcher.cpp; path = parser/MediaQueryBlockWatcher.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9493B6B71D74B3950088E780 /* MediaQueryBlockWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaQueryBlockWatcher.h; path = parser/MediaQueryBlockWatcher.h; sourceTree = "<group>"; };
</span><span class="cx"> 9493B6B81D74B3950088E780 /* MediaQueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaQueryParser.cpp; path = parser/MediaQueryParser.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11841,7 +11865,7 @@
</span><span class="cx"> A80E6E0D0A19911C007FB8C5 /* CSSStyleDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleDeclaration.h; sourceTree = "<group>"; };
</span><span class="cx"> A80E73480A199C77007FB8C5 /* CSSSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelector.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A80E734B0A199C77007FB8C5 /* CSSSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSSelector.h; sourceTree = "<group>"; };
</span><del>- A80E79960A19BD21007FB8C5 /* Rect.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Rect.idl; sourceTree = "<group>"; };
</del><ins>+ A80E79960A19BD21007FB8C5 /* DeprecatedCSSOMRect.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DeprecatedCSSOMRect.idl; sourceTree = "<group>"; };
</ins><span class="cx"> A80E79FC0A19C307007FB8C5 /* HTMLMetaElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLMetaElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> A80E7A150A19C3D6007FB8C5 /* JSHTMLMetaElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMetaElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A80E7A160A19C3D6007FB8C5 /* JSHTMLMetaElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLMetaElement.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12069,13 +12093,11 @@
</span><span class="cx"> A8CFF7A10A156978000A4234 /* HTMLAnchorElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLAnchorElement.h; sourceTree = "<group>"; };
</span><span class="cx"> A8D05FA50A23B301005E7203 /* JSCSSRuleList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSRuleList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8D05FA60A23B301005E7203 /* JSCSSRuleList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSRuleList.h; sourceTree = "<group>"; };
</span><del>- A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSValueList.cpp; sourceTree = "<group>"; };
- A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSValueList.h; sourceTree = "<group>"; };
</del><span class="cx"> A8D064EF0A23BFEA005E7203 /* HTMLFormElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLFormElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> A8D064F90A23C0CC005E7203 /* JSHTMLFormElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8D064FA0A23C0CC005E7203 /* JSHTMLFormElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLFormElement.h; sourceTree = "<group>"; };
</span><span class="cx"> A8D0651B0A23C1FE005E7203 /* CSSRuleList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSRuleList.idl; sourceTree = "<group>"; };
</span><del>- A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValueList.idl; sourceTree = "<group>"; };
</del><ins>+ A8D0651C0A23C1FE005E7203 /* DeprecatedCSSOMValueList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DeprecatedCSSOMValueList.idl; sourceTree = "<group>"; };
</ins><span class="cx"> A8D065AD0A2446CD005E7203 /* JSHTMLFormElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormElementCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A8D06B370A265DCD005E7203 /* HTMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLNames.h; sourceTree = "<group>"; };
</span><span class="cx"> A8D06B380A265DCD005E7203 /* HTMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLNames.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13234,8 +13256,6 @@
</span><span class="cx"> BC6D6E2509AF943500F59759 /* ScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScrollView.h; sourceTree = "<group>"; };
</span><span class="cx"> BC74DA351013F3F7007987AD /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
</span><span class="cx"> BC74DA361013F3F7007987AD /* RGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColor.cpp; sourceTree = "<group>"; };
</span><del>- BC74DA461013F468007987AD /* JSRGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRGBColor.cpp; sourceTree = "<group>"; };
- BC74DA471013F468007987AD /* JSRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.h; sourceTree = "<group>"; };
</del><span class="cx"> BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParserUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772B360C4EA91E0083285F /* CSSHelper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSHelper.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequest.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13483,8 +13503,6 @@
</span><span class="cx"> BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
</span><span class="cx"> BCFB45F317D8E39200444446 /* RenderBlockFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderBlockFlow.h; sourceTree = "<group>"; };
</span><span class="cx"> BCFB45F417D8E49400444446 /* RenderBlockFlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBlockFlow.cpp; sourceTree = "<group>"; };
</span><del>- BCFE2F0F0C1B58370020235F /* JSRect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRect.cpp; sourceTree = "<group>"; };
- BCFE2F100C1B58370020235F /* JSRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSRect.h; sourceTree = "<group>"; };
</del><span class="cx"> BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LengthBox.h; sourceTree = "<group>"; };
</span><span class="cx"> BCFF64900EAD15C200C1D6F7 /* LengthSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LengthSize.h; sourceTree = "<group>"; };
</span><span class="cx"> BE16C58E17CFE17200852C04 /* InbandGenericTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandGenericTextTrack.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -20429,8 +20447,6 @@
</span><span class="cx"> BCC065840F3CE2A700CD2D87 /* JSClientRect.h */,
</span><span class="cx"> BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */,
</span><span class="cx"> BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */,
</span><del>- 930705D709E0C9B700B17FE4 /* JSCounter.cpp */,
- 930705D909E0C9BF00B17FE4 /* JSCounter.h */,
</del><span class="cx"> BC46C1F20C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp */,
</span><span class="cx"> BC46C1F30C0DDC8F0020CFC3 /* JSCSSFontFaceRule.h */,
</span><span class="cx"> BC46C1F40C0DDC8F0020CFC3 /* JSCSSImportRule.cpp */,
</span><span class="lines">@@ -20445,8 +20461,6 @@
</span><span class="cx"> 94E839541DFB2BA6007BC6A7 /* JSCSSNamespaceRule.h */,
</span><span class="cx"> BC46C1F80C0DDC8F0020CFC3 /* JSCSSPageRule.cpp */,
</span><span class="cx"> BC46C1F90C0DDC8F0020CFC3 /* JSCSSPageRule.h */,
</span><del>- 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */,
- 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */,
</del><span class="cx"> 14CF7B3109F6ECD700EB3665 /* JSCSSRule.cpp */,
</span><span class="cx"> 14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */,
</span><span class="cx"> A8D05FA50A23B301005E7203 /* JSCSSRuleList.cpp */,
</span><span class="lines">@@ -20459,10 +20473,18 @@
</span><span class="cx"> BCC5BDFF0C0E93110011C2DB /* JSCSSStyleSheet.h */,
</span><span class="cx"> FD677736195CAB7D0072E0D3 /* JSCSSSupportsRule.cpp */,
</span><span class="cx"> FC84802E167AB444008CD100 /* JSCSSSupportsRule.h */,
</span><del>- 14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */,
- 14CF78A509F58CD800EB3665 /* JSCSSValue.h */,
- A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
- A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
</del><ins>+ 947949181E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.cpp */,
+ 947949191E02F6DE00018D85 /* JSDeprecatedCSSOMCounter.h */,
+ 9479491A1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.cpp */,
+ 9479491B1E02F6DE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.h */,
+ 9479491C1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.cpp */,
+ 9479491D1E02F6DE00018D85 /* JSDeprecatedCSSOMRect.h */,
+ 9479491E1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.cpp */,
+ 9479491F1E02F6DE00018D85 /* JSDeprecatedCSSOMRGBColor.h */,
+ 947949201E02F6DE00018D85 /* JSDeprecatedCSSOMValue.cpp */,
+ 947949211E02F6DE00018D85 /* JSDeprecatedCSSOMValue.h */,
+ 9479492B1E033B2800018D85 /* JSDeprecatedCSSOMValueList.cpp */,
+ 9479492C1E033B2800018D85 /* JSDeprecatedCSSOMValueList.h */,
</ins><span class="cx"> FD677737195CAB7D0072E0D3 /* JSDOMCSSNamespace.cpp */,
</span><span class="cx"> FC9E0E4B16419C1E00392BE3 /* JSDOMCSSNamespace.h */,
</span><span class="cx"> BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */,
</span><span class="lines">@@ -20471,10 +20493,6 @@
</span><span class="cx"> D3A94A43122DC40F00A37BBC /* JSMediaQueryList.h */,
</span><span class="cx"> 7C5343FA17B74B63004232F0 /* JSMediaQueryListListener.cpp */,
</span><span class="cx"> 7C5343FB17B74B63004232F0 /* JSMediaQueryListListener.h */,
</span><del>- BCFE2F0F0C1B58370020235F /* JSRect.cpp */,
- BCFE2F100C1B58370020235F /* JSRect.h */,
- BC74DA461013F468007987AD /* JSRGBColor.cpp */,
- BC74DA471013F468007987AD /* JSRGBColor.h */,
</del><span class="cx"> 0FF50267102BA9430066F39A /* JSStyleMedia.cpp */,
</span><span class="cx"> 0FF50268102BA9430066F39A /* JSStyleMedia.h */,
</span><span class="cx"> BCE013980C0BEF180043860A /* JSStyleSheet.cpp */,
</span><span class="lines">@@ -23378,7 +23396,6 @@
</span><span class="cx"> FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */,
</span><span class="cx"> FBD6AF8515EF21D4008B7110 /* BasicShapeFunctions.h */,
</span><span class="cx"> A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
</span><del>- 930705C709E0C95F00B17FE4 /* Counter.idl */,
</del><span class="cx"> 31BC742B1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp */,
</span><span class="cx"> 31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */,
</span><span class="cx"> CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */,
</span><span class="lines">@@ -23483,7 +23500,6 @@
</span><span class="cx"> 9418278D1D8CAE9500492764 /* CSSPendingSubstitutionValue.h */,
</span><span class="cx"> A80E6CDB0A1989CA007FB8C5 /* CSSPrimitiveValue.cpp */,
</span><span class="cx"> A80E6CBC0A1989CA007FB8C5 /* CSSPrimitiveValue.h */,
</span><del>- 9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */,
</del><span class="cx"> E1ED8AC20CC49BE000BFC557 /* CSSPrimitiveValueMappings.h */,
</span><span class="cx"> A80E6CCD0A1989CA007FB8C5 /* CSSProperty.cpp */,
</span><span class="cx"> A80E6CD50A1989CA007FB8C5 /* CSSProperty.h */,
</span><span class="lines">@@ -23534,11 +23550,9 @@
</span><span class="cx"> BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */,
</span><span class="cx"> AD03AAF81468453900A39B5B /* CSSValue.cpp */,
</span><span class="cx"> A80E6CC40A1989CA007FB8C5 /* CSSValue.h */,
</span><del>- 14CF787109F587CA00EB3665 /* CSSValue.idl */,
</del><span class="cx"> BCEA478C097CAAC80094C9E4 /* CSSValueKeywords.in */,
</span><span class="cx"> A80E6CBA0A1989CA007FB8C5 /* CSSValueList.cpp */,
</span><span class="cx"> A80E6CBF0A1989CA007FB8C5 /* CSSValueList.h */,
</span><del>- A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */,
</del><span class="cx"> E49BDA0A131FD3E5003C56F0 /* CSSValuePool.cpp */,
</span><span class="cx"> E49BD9F9131FD2ED003C56F0 /* CSSValuePool.h */,
</span><span class="cx"> 9444CBDE1D8861580073A074 /* CSSVariableData.cpp */,
</span><span class="lines">@@ -23546,6 +23560,21 @@
</span><span class="cx"> 9444CBDC1D8861580073A074 /* CSSVariableReferenceValue.cpp */,
</span><span class="cx"> 9444CBDB1D8861580073A074 /* CSSVariableReferenceValue.h */,
</span><span class="cx"> A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
</span><ins>+ 9479492A1E032EDB00018D85 /* DeprecatedCSSOMCounter.h */,
+ 930705C709E0C95F00B17FE4 /* DeprecatedCSSOMCounter.idl */,
+ 9479493B1E045CE100018D85 /* DeprecatedCSSOMPrimitiveValue.cpp */,
+ 947949261E03132000018D85 /* DeprecatedCSSOMPrimitiveValue.h */,
+ 9307059009E0C75800B17FE4 /* DeprecatedCSSOMPrimitiveValue.idl */,
+ 947949281E032AE900018D85 /* DeprecatedCSSOMRect.h */,
+ A80E79960A19BD21007FB8C5 /* DeprecatedCSSOMRect.idl */,
+ 947949291E032D5800018D85 /* DeprecatedCSSOMRGBColor.h */,
+ 858C38EF0AA8FDD100B187A4 /* DeprecatedCSSOMRGBColor.idl */,
+ 947949221E02F90B00018D85 /* DeprecatedCSSOMValue.cpp */,
+ 947949231E02F90B00018D85 /* DeprecatedCSSOMValue.h */,
+ 14CF787109F587CA00EB3665 /* DeprecatedCSSOMValue.idl */,
+ 9479492D1E04578D00018D85 /* DeprecatedCSSOMValueList.cpp */,
+ 947949271E03132000018D85 /* DeprecatedCSSOMValueList.h */,
+ A8D0651C0A23C1FE005E7203 /* DeprecatedCSSOMValueList.idl */,
</ins><span class="cx"> 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */,
</span><span class="cx"> 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */,
</span><span class="cx"> FD677735195CAB200072E0D3 /* DOMCSSNamespace.cpp */,
</span><span class="lines">@@ -23601,10 +23630,8 @@
</span><span class="cx"> E4BBED0D14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h */,
</span><span class="cx"> 93CA4C9F09DF93FA00DF8677 /* quirks.css */,
</span><span class="cx"> BC4368E70C226E32005EFB5F /* Rect.h */,
</span><del>- A80E79960A19BD21007FB8C5 /* Rect.idl */,
</del><span class="cx"> BC74DA361013F3F7007987AD /* RGBColor.cpp */,
</span><span class="cx"> BC74DA351013F3F7007987AD /* RGBColor.h */,
</span><del>- 858C38EF0AA8FDD100B187A4 /* RGBColor.idl */,
</del><span class="cx"> A79BAD9D161E7F3F00C2E652 /* RuleFeature.cpp */,
</span><span class="cx"> A79BAD9E161E7F3F00C2E652 /* RuleFeature.h */,
</span><span class="cx"> A79BAD9F161E7F3F00C2E652 /* RuleSet.cpp */,
</span><span class="lines">@@ -25102,6 +25129,7 @@
</span><span class="cx"> 14D824080AF93AEB0004F057 /* ChromeClient.h in Headers */,
</span><span class="cx"> E4A814D41C6DEC4000BF85AC /* ClassChangeInvalidation.h in Headers */,
</span><span class="cx"> 8348BFAC1B85729800912F36 /* ClassCollection.h in Headers */,
</span><ins>+ 947949401E0463CE00018D85 /* DeprecatedCSSOMPrimitiveValue.h in Headers */,
</ins><span class="cx"> BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */,
</span><span class="cx"> BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */,
</span><span class="cx"> 7C3A91E61C963B8800D1A7E3 /* ClipboardAccessPolicy.h in Headers */,
</span><span class="lines">@@ -25328,6 +25356,7 @@
</span><span class="cx"> A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */,
</span><span class="cx"> A8EA80070A19516E00A8EF5F /* CSSStyleSheet.h in Headers */,
</span><span class="cx"> 94DE5C921D83011D00164F2A /* CSSSupportsParser.h in Headers */,
</span><ins>+ 9479493D1E0463B600018D85 /* DeprecatedCSSOMValueList.h in Headers */,
</ins><span class="cx"> FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */,
</span><span class="cx"> BC80C9880CD294EE00A0B7B3 /* CSSTimingFunctionValue.h in Headers */,
</span><span class="cx"> 946D373A1D6CDFC00077084F /* CSSTokenizer.h in Headers */,
</span><span class="lines">@@ -26005,6 +26034,7 @@
</span><span class="cx"> D07DEABA0A36554A00CA30F8 /* InsertListCommand.h in Headers */,
</span><span class="cx"> 93309DEE099E64920056E581 /* InsertNodeBeforeCommand.h in Headers */,
</span><span class="cx"> 93309DF0099E64920056E581 /* InsertParagraphSeparatorCommand.h in Headers */,
</span><ins>+ 947949311E0459FA00018D85 /* JSDeprecatedCSSOMCounter.h in Headers */,
</ins><span class="cx"> 93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */,
</span><span class="cx"> B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
</span><span class="cx"> 1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
</span><span class="lines">@@ -26106,7 +26136,6 @@
</span><span class="cx"> 79AC9219109945C80021266E /* JSCompositionEvent.h in Headers */,
</span><span class="cx"> FDA15EBE12B03F0B003A583A /* JSConvolverNode.h in Headers */,
</span><span class="cx"> FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */,
</span><del>- 930705DA09E0C9BF00B17FE4 /* JSCounter.h in Headers */,
</del><span class="cx"> 14DCF3B31B6BE2080062D4C2 /* JSCountQueuingStrategy.h in Headers */,
</span><span class="cx"> 975CA2A21303679D00E99AD9 /* JSCrypto.h in Headers */,
</span><span class="cx"> E157A8F118185425009F821D /* JSCryptoAlgorithmBuilder.h in Headers */,
</span><span class="lines">@@ -26126,7 +26155,6 @@
</span><span class="cx"> BC46C2010C0DDC8F0020CFC3 /* JSCSSMediaRule.h in Headers */,
</span><span class="cx"> 94E839561DFB2BC4007BC6A7 /* JSCSSNamespaceRule.h in Headers */,
</span><span class="cx"> BC46C2030C0DDC8F0020CFC3 /* JSCSSPageRule.h in Headers */,
</span><del>- 930705EB09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h in Headers */,
</del><span class="cx"> 14CF7B3409F6ECD700EB3665 /* JSCSSRule.h in Headers */,
</span><span class="cx"> AD726FEF16DA11F5003A4E6D /* JSCSSRuleCustom.h in Headers */,
</span><span class="cx"> A8D05FA80A23B301005E7203 /* JSCSSRuleList.h in Headers */,
</span><span class="lines">@@ -26135,8 +26163,6 @@
</span><span class="cx"> BC46C2070C0DDCA10020CFC3 /* JSCSSStyleRule.h in Headers */,
</span><span class="cx"> BCC5BE010C0E93110011C2DB /* JSCSSStyleSheet.h in Headers */,
</span><span class="cx"> FC54D05816A7676E00575E4D /* JSCSSSupportsRule.h in Headers */,
</span><del>- 14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */,
- A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */,
</del><span class="cx"> 9BD4E9171C462872005065BC /* JSCustomElementInterface.h in Headers */,
</span><span class="cx"> 9BE6710C1D5AEB2500345514 /* JSCustomElementRegistry.h in Headers */,
</span><span class="cx"> E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */,
</span><span class="lines">@@ -26284,6 +26310,7 @@
</span><span class="cx"> A80E7E990A1A83E3007FB8C5 /* JSHTMLOptionElement.h in Headers */,
</span><span class="cx"> 448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */,
</span><span class="cx"> 4AD0173D127E82860015035F /* JSHTMLOutputElement.h in Headers */,
</span><ins>+ 947949341E0459FA00018D85 /* JSDeprecatedCSSOMRect.h in Headers */,
</ins><span class="cx"> 1AE2ABA70A1CE90500B42B25 /* JSHTMLParagraphElement.h in Headers */,
</span><span class="cx"> 1AE2ABA90A1CE90500B42B25 /* JSHTMLParamElement.h in Headers */,
</span><span class="cx"> BC3D85BC1C0E2E7A00D3B610 /* JSHTMLPictureElement.h in Headers */,
</span><span class="lines">@@ -26420,10 +26447,9 @@
</span><span class="cx"> 7C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultReader.h in Headers */,
</span><span class="cx"> 4129DF861BB5B80C00322A16 /* JSReadableStreamPrivateConstructors.h in Headers */,
</span><span class="cx"> 7E4C96DD1AD4483500365A51 /* JSReadableStreamSource.h in Headers */,
</span><del>- BCFE2F120C1B58380020235F /* JSRect.h in Headers */,
</del><span class="cx"> 4998AECE13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h in Headers */,
</span><del>- BC74DA491013F468007987AD /* JSRGBColor.h in Headers */,
</del><span class="cx"> 57E233711DCD468F00F28D01 /* JSRsaHashedImportParams.h in Headers */,
</span><ins>+ 947949321E0459FA00018D85 /* JSDeprecatedCSSOMPrimitiveValue.h in Headers */,
</ins><span class="cx"> 5768E4341DB7524500D0A4F7 /* JSRsaHashedKeyGenParams.h in Headers */,
</span><span class="cx"> 57FEDD411DB6D73A00EB96F5 /* JSRsaKeyGenParams.h in Headers */,
</span><span class="cx"> 5706A6981DDE5E4600A03B14 /* JSRsaOaepParams.h in Headers */,
</span><span class="lines">@@ -26868,6 +26894,7 @@
</span><span class="cx"> C96F5EC81B5872260091EA9D /* MediaSessionInterruptionProvider.h in Headers */,
</span><span class="cx"> C96F5EC51B5872260091EA9D /* MediaSessionInterruptionProviderMac.h in Headers */,
</span><span class="cx"> C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */,
</span><ins>+ 9479493F1E0463C600018D85 /* DeprecatedCSSOMRect.h in Headers */,
</ins><span class="cx"> 07638A991884487200E15A1B /* MediaSessionManagerIOS.h in Headers */,
</span><span class="cx"> C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */,
</span><span class="cx"> CD3A495F17A9D01B00274E42 /* MediaSource.h in Headers */,
</span><span class="lines">@@ -27283,6 +27310,7 @@
</span><span class="cx"> 3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */,
</span><span class="cx"> 0BE030A20F3112FB003C1A46 /* RenderLineBoxList.h in Headers */,
</span><span class="cx"> BCEA4864097D93020094C9E4 /* RenderLineBreak.h in Headers */,
</span><ins>+ 9479493A1E0459FA00018D85 /* JSDeprecatedCSSOMValueList.h in Headers */,
</ins><span class="cx"> ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */,
</span><span class="cx"> A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */,
</span><span class="cx"> A8EA7A500A191A5200A8EF5F /* RenderListMarker.h in Headers */,
</span><span class="lines">@@ -27293,6 +27321,7 @@
</span><span class="cx"> 439046DC12DA25E800AF80A2 /* RenderMathMLFraction.h in Headers */,
</span><span class="cx"> 439046DE12DA25E800AF80A2 /* RenderMathMLMath.h in Headers */,
</span><span class="cx"> 439046E012DA25E800AF80A2 /* RenderMathMLOperator.h in Headers */,
</span><ins>+ 9479493E1E0463BE00018D85 /* DeprecatedCSSOMRGBColor.h in Headers */,
</ins><span class="cx"> 439046E212DA25E800AF80A2 /* RenderMathMLRoot.h in Headers */,
</span><span class="cx"> 439046E412DA25E800AF80A2 /* RenderMathMLRow.h in Headers */,
</span><span class="cx"> 439046E812DA25E800AF80A2 /* RenderMathMLScripts.h in Headers */,
</span><span class="lines">@@ -27661,6 +27690,7 @@
</span><span class="cx"> 93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
</span><span class="cx"> 26B999911803B3C900D01121 /* StackAllocator.h in Headers */,
</span><span class="cx"> BC7FA62D0D1F0EFF00DB22A9 /* StaticNodeList.h in Headers */,
</span><ins>+ 947949251E0308AF00018D85 /* DeprecatedCSSOMValue.h in Headers */,
</ins><span class="cx"> F433E9031DBBDBA200EF0D14 /* StaticPasteboard.h in Headers */,
</span><span class="cx"> F44EBBD91DB5D21400277334 /* StaticRange.h in Headers */,
</span><span class="cx"> A5AFB350115151A700B045CB /* StepRange.h in Headers */,
</span><span class="lines">@@ -27774,6 +27804,7 @@
</span><span class="cx"> 085A15931289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h in Headers */,
</span><span class="cx"> 439D334313A6911C00C20F4F /* SVGAnimatedType.h in Headers */,
</span><span class="cx"> 439D334413A6911C00C20F4F /* SVGAnimatedTypeAnimator.h in Headers */,
</span><ins>+ 947949381E0459FA00018D85 /* JSDeprecatedCSSOMValue.h in Headers */,
</ins><span class="cx"> B22279900D00BF220071B782 /* SVGAnimateElement.h in Headers */,
</span><span class="cx"> 832B843419D8E55100B26055 /* SVGAnimateElementBase.h in Headers */,
</span><span class="cx"> B22279930D00BF220071B782 /* SVGAnimateMotionElement.h in Headers */,
</span><span class="lines">@@ -27849,6 +27880,7 @@
</span><span class="cx"> 0854B01F1255E4E600B9CDD0 /* SVGInlineFlowBox.h in Headers */,
</span><span class="cx"> 0854B0211255E4E600B9CDD0 /* SVGInlineTextBox.h in Headers */,
</span><span class="cx"> B2227A300D00BF220071B782 /* SVGLangSpace.h in Headers */,
</span><ins>+ 947949361E0459FA00018D85 /* JSDeprecatedCSSOMRGBColor.h in Headers */,
</ins><span class="cx"> 7134496E146941B300720312 /* SVGLengthContext.h in Headers */,
</span><span class="cx"> B2227A360D00BF220071B782 /* SVGLengthList.h in Headers */,
</span><span class="cx"> 7C39C3651DDA865200FEFB29 /* SVGLengthListValues.h in Headers */,
</span><span class="lines">@@ -28103,6 +28135,7 @@
</span><span class="cx"> 2D232C001A326F02006BF2DB /* TUCallSPI.h in Headers */,
</span><span class="cx"> C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
</span><span class="cx"> E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */,
</span><ins>+ 947949411E0463D400018D85 /* DeprecatedCSSOMCounter.h in Headers */,
</ins><span class="cx"> 93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
</span><span class="cx"> 7C6523181E00DBB500677F22 /* JSApplePayPaymentMethod.h in Headers */,
</span><span class="cx"> 85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
</span><span class="lines">@@ -29356,6 +29389,7 @@
</span><span class="cx"> CDF4B72B1E03C63E00E235A2 /* JSMediaKeysRequirement.cpp in Sources */,
</span><span class="cx"> 84730D7E1248F0B300D3A9C9 /* FEFlood.cpp in Sources */,
</span><span class="cx"> 84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */,
</span><ins>+ 947949301E0459EE00018D85 /* JSDeprecatedCSSOMPrimitiveValue.cpp in Sources */,
</ins><span class="cx"> 84730D801248F0B300D3A9C9 /* FELighting.cpp in Sources */,
</span><span class="cx"> 84730D821248F0B300D3A9C9 /* FEMerge.cpp in Sources */,
</span><span class="cx"> 84730D841248F0B300D3A9C9 /* FEMorphology.cpp in Sources */,
</span><span class="lines">@@ -29621,6 +29655,7 @@
</span><span class="cx"> 977B3877122883E900B81FF8 /* HTMLTokenizer.cpp in Sources */,
</span><span class="cx"> 0707568B142262D600414161 /* HTMLTrackElement.cpp in Sources */,
</span><span class="cx"> 977B37251228721700B81FF8 /* HTMLTreeBuilder.cpp in Sources */,
</span><ins>+ 947949241E0308A400018D85 /* DeprecatedCSSOMValue.cpp in Sources */,
</ins><span class="cx"> A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */,
</span><span class="cx"> E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
</span><span class="cx"> 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */,
</span><span class="lines">@@ -29800,6 +29835,7 @@
</span><span class="cx"> FDA15EB312B03EE1003A583A /* JSAudioParam.cpp in Sources */,
</span><span class="cx"> FDA15EB512B03EE1003A583A /* JSAudioProcessingEvent.cpp in Sources */,
</span><span class="cx"> BE8EF042171C8FF9009B48C3 /* JSAudioTrack.cpp in Sources */,
</span><ins>+ 947949371E0459FA00018D85 /* JSDeprecatedCSSOMValue.cpp in Sources */,
</ins><span class="cx"> BE6DF711171CA2DA00DD52B8 /* JSAudioTrackCustom.cpp in Sources */,
</span><span class="cx"> BE8EF044171C8FF9009B48C3 /* JSAudioTrackList.cpp in Sources */,
</span><span class="cx"> BE6DF713171CA2DA00DD52B8 /* JSAudioTrackListCustom.cpp in Sources */,
</span><span class="lines">@@ -29833,7 +29869,6 @@
</span><span class="cx"> 79AC9218109945C80021266E /* JSCompositionEvent.cpp in Sources */,
</span><span class="cx"> FDA15EBD12B03F0B003A583A /* JSConvolverNode.cpp in Sources */,
</span><span class="cx"> FE6FD48D0F676E9300092873 /* JSCoordinates.cpp in Sources */,
</span><del>- 930705D809E0C9B700B17FE4 /* JSCounter.cpp in Sources */,
</del><span class="cx"> 14DCF3B21B6BE2080062D4C2 /* JSCountQueuingStrategy.cpp in Sources */,
</span><span class="cx"> 975CA2A11303679D00E99AD9 /* JSCrypto.cpp in Sources */,
</span><span class="cx"> E157A8F018185425009F821D /* JSCryptoAlgorithmBuilder.cpp in Sources */,
</span><span class="lines">@@ -29854,7 +29889,6 @@
</span><span class="cx"> BC46C2000C0DDC8F0020CFC3 /* JSCSSMediaRule.cpp in Sources */,
</span><span class="cx"> 94E839551DFB2BC4007BC6A7 /* JSCSSNamespaceRule.cpp in Sources */,
</span><span class="cx"> BC46C2020C0DDC8F0020CFC3 /* JSCSSPageRule.cpp in Sources */,
</span><del>- 930705E909E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp in Sources */,
</del><span class="cx"> 14CF7B3309F6ECD700EB3665 /* JSCSSRule.cpp in Sources */,
</span><span class="cx"> BC46C1EE0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp in Sources */,
</span><span class="cx"> A8D05FA70A23B301005E7203 /* JSCSSRuleList.cpp in Sources */,
</span><span class="lines">@@ -29864,9 +29898,7 @@
</span><span class="cx"> BC46C2060C0DDCA10020CFC3 /* JSCSSStyleRule.cpp in Sources */,
</span><span class="cx"> BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */,
</span><span class="cx"> FD67773A195CB14A0072E0D3 /* JSCSSSupportsRule.cpp in Sources */,
</span><del>- 14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */,
</del><span class="cx"> BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */,
</span><del>- A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */,
</del><span class="cx"> 9BD4E9161C462872005065BC /* JSCustomElementInterface.cpp in Sources */,
</span><span class="cx"> 9BE6710B1D5AEB2100345514 /* JSCustomElementRegistry.cpp in Sources */,
</span><span class="cx"> 9BC5F9E01D5AAF6B002B749D /* JSCustomElementRegistryCustom.cpp in Sources */,
</span><span class="lines">@@ -29903,6 +29935,7 @@
</span><span class="cx"> E1C36CBD0EB08062007410BC /* JSDOMGlobalObject.cpp in Sources */,
</span><span class="cx"> 7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */,
</span><span class="cx"> 65DF31F709D1CC60000BE325 /* JSDOMImplementation.cpp in Sources */,
</span><ins>+ 9479493C1E045CF300018D85 /* DeprecatedCSSOMPrimitiveValue.cpp in Sources */,
</ins><span class="cx"> 4138F8571D253F08001CB61E /* JSDOMIterator.cpp in Sources */,
</span><span class="cx"> A9D248060D757E7D00FDF959 /* JSDOMMimeType.cpp in Sources */,
</span><span class="cx"> A9D248080D757E7D00FDF959 /* JSDOMMimeTypeArray.cpp in Sources */,
</span><span class="lines">@@ -29943,6 +29976,7 @@
</span><span class="cx"> 14E8378409F85D1C00B85AE4 /* JSEvent.cpp in Sources */,
</span><span class="cx"> BCEFAF4E0C317E6900FA81F6 /* JSEventCustom.cpp in Sources */,
</span><span class="cx"> 836D032F1DA8A13A00FFD96B /* JSEventInit.cpp in Sources */,
</span><ins>+ 947949351E0459FA00018D85 /* JSDeprecatedCSSOMRGBColor.cpp in Sources */,
</ins><span class="cx"> 93B70D6909EB0C7C009D8468 /* JSEventListener.cpp in Sources */,
</span><span class="cx"> E0FEF372B47C53EAC1C1FBEE /* JSEventSource.cpp in Sources */,
</span><span class="cx"> C6A703325C9D0B6CDCBC4D77 /* JSEventTarget.cpp in Sources */,
</span><span class="lines">@@ -30211,9 +30245,7 @@
</span><span class="cx"> 4129DF851BB5B80700322A16 /* JSReadableStreamPrivateConstructors.cpp in Sources */,
</span><span class="cx"> 7E4C96DC1AD4483500365A51 /* JSReadableStreamSource.cpp in Sources */,
</span><span class="cx"> 418C39601C8F0AAE0051C8A3 /* JSReadableStreamSourceCustom.cpp in Sources */,
</span><del>- BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
</del><span class="cx"> 4998AECD13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.cpp in Sources */,
</span><del>- BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
</del><span class="cx"> 57E233731DCD46B600F28D01 /* JSRsaHashedImportParams.cpp in Sources */,
</span><span class="cx"> 5768E4361DB7527400D0A4F7 /* JSRsaHashedKeyGenParams.cpp in Sources */,
</span><span class="cx"> 57FEDD431DB6D76000EB96F5 /* JSRsaKeyGenParams.cpp in Sources */,
</span><span class="lines">@@ -30521,6 +30553,7 @@
</span><span class="cx"> 1ACE53F60A8D19470022947D /* JSXMLSerializer.cpp in Sources */,
</span><span class="cx"> 1A762C730A074F2600989F5B /* JSXPathEvaluator.cpp in Sources */,
</span><span class="cx"> BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */,
</span><ins>+ 9479492E1E0457BA00018D85 /* DeprecatedCSSOMValueList.cpp in Sources */,
</ins><span class="cx"> 1A762C750A074F2600989F5B /* JSXPathExpression.cpp in Sources */,
</span><span class="cx"> 1A762C770A074F2600989F5B /* JSXPathNSResolver.cpp in Sources */,
</span><span class="cx"> 836C14431CDEAFD80073493F /* JSXPathNSResolverCustom.cpp in Sources */,
</span><span class="lines">@@ -30614,6 +30647,7 @@
</span><span class="cx"> 7C6579F11E00856600E3A27A /* JSApplePayPaymentRequest.cpp in Sources */,
</span><span class="cx"> 439176DF12DA25E17BAF80A2 /* MathMLStyle.cpp in Sources */,
</span><span class="cx"> FA654A6B1108ABED002615E0 /* MathMLTokenElement.cpp in Sources */,
</span><ins>+ 947949391E0459FA00018D85 /* JSDeprecatedCSSOMValueList.cpp in Sources */,
</ins><span class="cx"> FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */,
</span><span class="cx"> 439046E912DA25E812AF80AC /* MathOperator.cpp in Sources */,
</span><span class="cx"> 49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */,
</span><span class="lines">@@ -31160,6 +31194,7 @@
</span><span class="cx"> 0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */,
</span><span class="cx"> 1AA84F04143BA7BD0051D153 /* ScrollController.mm in Sources */,
</span><span class="cx"> 0F605AEC15F94848004DF0C0 /* ScrollingConstraints.cpp in Sources */,
</span><ins>+ 9479492F1E0459EB00018D85 /* JSDeprecatedCSSOMCounter.cpp in Sources */,
</ins><span class="cx"> 1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */,
</span><span class="cx"> 0FC4E40E187F82E10045882C /* ScrollingCoordinatorIOS.mm in Sources */,
</span><span class="cx"> 1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */,
</span><span class="lines">@@ -31527,6 +31562,7 @@
</span><span class="cx"> E180811216FCF42F00B80D07 /* SynchronousLoaderClient.cpp in Sources */,
</span><span class="cx"> E180811616FCF9CB00B80D07 /* SynchronousLoaderClient.mm in Sources */,
</span><span class="cx"> 442ABCD617D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp in Sources */,
</span><ins>+ 947949331E0459FA00018D85 /* JSDeprecatedCSSOMRect.cpp in Sources */,
</ins><span class="cx"> 26FAE4CE1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp in Sources */,
</span><span class="cx"> E45390AE0EAFF4B5003695C8 /* SystemMemoryIOS.cpp in Sources */,
</span><span class="cx"> CDA07FBD18E0A16A004699FA /* SystemSleepListener.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDOMWrapperWorldh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSValue;
</del><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> class ScriptController;
</span><span class="cx">
</span><span class="cx"> typedef HashMap<void*, JSC::Weak<JSC::JSObject>> DOMObjectWrapperMap;
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: can we make this private?
</span><span class="cx"> DOMObjectWrapperMap m_wrappers;
</span><del>- HashMap<CSSValue*, void*> m_cssValueRoots;
</del><ins>+ HashMap<DeprecatedCSSOMValue*, void*> m_deprecatedCSSOMValueRoots;
</ins><span class="cx">
</span><span class="cx"> bool isNormal() const { return m_isNormal; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,17 +26,16 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSCSSStyleDeclarationCustom.h"
</span><span class="cx">
</span><del>-#include "CSSPrimitiveValue.h"
</del><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSPropertyParser.h"
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><del>-#include "CSSValue.h"
</del><span class="cx"> #include "CustomElementReactionQueue.h"
</span><ins>+#include "DeprecatedCSSOMPrimitiveValue.h"
</ins><span class="cx"> #include "HashTools.h"
</span><span class="cx"> #include "JSCSSStyleDeclaration.h"
</span><del>-#include "JSCSSValue.h"
</del><ins>+#include "JSDeprecatedCSSOMValue.h"
</ins><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSStyleSheetCustom.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="lines">@@ -365,7 +364,7 @@
</span><span class="cx"> if (!value)
</span><span class="cx"> return jsNull();
</span><span class="cx">
</span><del>- globalObject()->world().m_cssValueRoots.add(value.get(), root(&wrapped())); // Balanced by JSCSSValueOwner::finalize().
</del><ins>+ globalObject()->world().m_deprecatedCSSOMValueRoots.add(value.get(), root(&wrapped())); // Balanced by JSDeprecatedCSSOMValueOwner::finalize().
</ins><span class="cx"> return toJS(&state, globalObject(), *value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSValueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "JSCSSValue.h"
</del><span class="cx">
</span><del>-#include "CSSPrimitiveValue.h"
-#include "CSSValueList.h"
-#include "JSCSSPrimitiveValue.h"
-#include "JSCSSValueList.h"
</del><ins>+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include "DeprecatedCSSOMValueList.h"
+#include "JSDeprecatedCSSOMPrimitiveValue.h"
+#include "JSDeprecatedCSSOMValue.h"
+#include "JSDeprecatedCSSOMValueList.h"
</ins><span class="cx"> #include "JSNode.h"
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -36,44 +36,37 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool JSCSSValueOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void* context, SlotVisitor& visitor)
</del><ins>+bool JSDeprecatedCSSOMValueOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void* context, SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSCSSValue* jsCSSValue = jsCast<JSCSSValue*>(handle.slot()->asCell());
</del><ins>+ JSDeprecatedCSSOMValue* jsCSSValue = jsCast<JSDeprecatedCSSOMValue*>(handle.slot()->asCell());
</ins><span class="cx"> if (!jsCSSValue->hasCustomProperties())
</span><span class="cx"> return false;
</span><span class="cx"> DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
</span><del>- void* root = world->m_cssValueRoots.get(&jsCSSValue->wrapped());
</del><ins>+ void* root = world->m_deprecatedCSSOMValueRoots.get(&jsCSSValue->wrapped());
</ins><span class="cx"> if (!root)
</span><span class="cx"> return false;
</span><span class="cx"> return visitor.containsOpaqueRoot(root);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSCSSValueOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
</del><ins>+void JSDeprecatedCSSOMValueOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
</ins><span class="cx"> {
</span><del>- JSCSSValue* jsCSSValue = jsCast<JSCSSValue*>(handle.slot()->asCell());
</del><ins>+ JSDeprecatedCSSOMValue* jsCSSValue = jsCast<JSDeprecatedCSSOMValue*>(handle.slot()->asCell());
</ins><span class="cx"> DOMWrapperWorld& world = *static_cast<DOMWrapperWorld*>(context);
</span><del>- world.m_cssValueRoots.remove(&jsCSSValue->wrapped());
</del><ins>+ world.m_deprecatedCSSOMValueRoots.remove(&jsCSSValue->wrapped());
</ins><span class="cx"> uncacheWrapper(world, &jsCSSValue->wrapped(), jsCSSValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<CSSValue>&& value)
</del><ins>+JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<DeprecatedCSSOMValue>&& value)
</ins><span class="cx"> {
</span><span class="cx"> if (value->isValueList())
</span><del>- return createWrapper<CSSValueList>(globalObject, WTFMove(value));
</del><ins>+ return createWrapper<DeprecatedCSSOMValueList>(globalObject, WTFMove(value));
</ins><span class="cx"> if (value->isPrimitiveValue())
</span><del>- return createWrapper<CSSPrimitiveValue>(globalObject, WTFMove(value));
- return createWrapper<CSSValue>(globalObject, WTFMove(value));
</del><ins>+ return createWrapper<DeprecatedCSSOMPrimitiveValue>(globalObject, WTFMove(value));
+ return createWrapper<DeprecatedCSSOMValue>(globalObject, WTFMove(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, CSSValue& value)
</del><ins>+JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, DeprecatedCSSOMValue& value)
</ins><span class="cx"> {
</span><del>- // Scripts should only ever see cloned CSSValues, never the internal ones.
- ASSERT(value.isCSSOMSafe());
-
- // If we're here under erroneous circumstances, prefer returning null over a potentially insecure value.
- if (!value.isCSSOMSafe())
- return jsNull();
-
</del><span class="cx"> return wrap(state, globalObject, value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #include "ContentData.h"
</span><span class="cx"> #include "CounterContent.h"
</span><span class="cx"> #include "CursorList.h"
</span><ins>+#include "DeprecatedCSSOMValue.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "FontTaggedSettings.h"
</span><span class="lines">@@ -4118,16 +4119,22 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(const String& propertyName)
</del><ins>+RefPtr<DeprecatedCSSOMValue> CSSComputedStyleDeclaration::getPropertyCSSValue(const String& propertyName)
</ins><span class="cx"> {
</span><del>- if (isCustomPropertyName(propertyName))
- return ComputedStyleExtractor(m_element.ptr(), m_allowVisitedStyle, m_pseudoElementSpecifier).customPropertyValue(propertyName);
</del><ins>+ if (isCustomPropertyName(propertyName)) {
+ auto value = ComputedStyleExtractor(m_element.ptr(), m_allowVisitedStyle, m_pseudoElementSpecifier).customPropertyValue(propertyName);
+ if (!value)
+ return nullptr;
+ return value->createDeprecatedCSSOMWrapper();
+ }
</ins><span class="cx">
</span><span class="cx"> CSSPropertyID propertyID = cssPropertyID(propertyName);
</span><span class="cx"> if (!propertyID)
</span><span class="cx"> return nullptr;
</span><span class="cx"> RefPtr<CSSValue> value = getPropertyCSSValue(propertyID);
</span><del>- return value ? value->cloneForCSSOM() : nullptr;
</del><ins>+ if (!value)
+ return nullptr;
+ return value->createDeprecatedCSSOMWrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSComputedStyleDeclaration::getPropertyValue(const String &propertyName)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> CSSRule* parentRule() const final;
</span><span class="cx"> unsigned length() const final;
</span><span class="cx"> String item(unsigned index) const final;
</span><del>- RefPtr<CSSValue> getPropertyCSSValue(const String& propertyName) final;
</del><ins>+ RefPtr<DeprecatedCSSOMValue> getPropertyCSSValue(const String& propertyName) final;
</ins><span class="cx"> String getPropertyValue(const String& propertyName) final;
</span><span class="cx"> String getPropertyPriority(const String& propertyName) final;
</span><span class="cx"> String getPropertyShorthand(const String& propertyName) final;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGridLineNamesValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGridLineNamesValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGridLineNamesValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSGridLineNamesValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -44,11 +44,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSGridLineNamesValue> CSSGridLineNamesValue::cloneForCSSOM() const
-{
- return adoptRef(*new CSSGridLineNamesValue(*this));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGridLineNamesValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGridLineNamesValue.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGridLineNamesValue.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSGridLineNamesValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><del>- Ref<CSSGridLineNamesValue> cloneForCSSOM() const;
-
</del><span class="cx"> private:
</span><span class="cx"> CSSGridLineNamesValue();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -159,15 +159,4 @@
</span><span class="cx"> return handler(*m_cachedImage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom)
- : CSSValueList(cloneFrom)
-{
- // Non-CSSValueList data is not accessible through CSS OM, no need to clone.
-}
-
-Ref<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const
-{
- return adoptRef(*new CSSImageSetValue(*this));
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSImageSetValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx">
</span><span class="cx"> bool traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const;
</span><span class="cx">
</span><del>- Ref<CSSImageSetValue> cloneForCSSOM() const;
-
</del><span class="cx"> void updateDeviceScaleFactor(const Document&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -64,7 +62,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSImageSetValue();
</span><del>- CSSImageSetValue(const CSSImageSetValue& cloneFrom);
</del><span class="cx">
</span><span class="cx"> void fillImageSet();
</span><span class="cx"> static inline bool compareByScaleFactor(ImageWithScale first, ImageWithScale second) { return first.scaleFactor < second.scaleFactor; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><span class="cx"> #include "CachedResourceRequestInitiators.h"
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><ins>+#include "DeprecatedCSSOMPrimitiveValue.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="lines">@@ -98,12 +99,10 @@
</span><span class="cx"> return serializeURL(m_url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSValue> CSSImageValue::cloneForCSSOM() const
</del><ins>+Ref<DeprecatedCSSOMValue> CSSImageValue::createDeprecatedCSSOMWrapper() const
</ins><span class="cx"> {
</span><span class="cx"> // NOTE: We expose CSSImageValues as URI primitive values in CSSOM to maintain old behavior.
</span><del>- Ref<CSSPrimitiveValue> uriValue = CSSPrimitiveValue::create(m_url, CSSPrimitiveValue::CSS_URI);
- uriValue->setCSSOMSafe();
- return WTFMove(uriValue);
</del><ins>+ return DeprecatedCSSOMPrimitiveValue::create(CSSPrimitiveValue::create(m_url, CSSPrimitiveValue::CSS_URI));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSImageValue::knownToBeOpaque(const RenderElement* renderer) const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSImageValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedImage;
</span><span class="cx"> class CachedResourceLoader;
</span><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> class RenderElement;
</span><span class="cx"> struct ResourceLoaderOptions;
</span><span class="cx">
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><del>- Ref<CSSValue> cloneForCSSOM() const;
</del><ins>+ Ref<DeprecatedCSSOMValue> createDeprecatedCSSOMWrapper() const;
</ins><span class="cx">
</span><span class="cx"> bool traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "CalculationValue.h"
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "Counter.h"
</span><ins>+#include "DeprecatedCSSOMPrimitiveValue.h"
</ins><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "Node.h"
</span><span class="lines">@@ -1174,104 +1175,6 @@
</span><span class="cx"> return text;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSPrimitiveValue> CSSPrimitiveValue::cloneForCSSOM() const
-{
- RefPtr<CSSPrimitiveValue> result;
-
- switch (m_primitiveUnitType) {
- case CSS_STRING:
- case CSS_URI:
- case CSS_ATTR:
- case CSS_COUNTER_NAME:
- result = CSSPrimitiveValue::create(m_value.string, static_cast<UnitType>(m_primitiveUnitType));
- break;
- case CSS_FONT_FAMILY:
- result = CSSPrimitiveValue::create(*m_value.fontFamily);
- break;
- case CSS_COUNTER:
- result = CSSPrimitiveValue::create(m_value.counter->cloneForCSSOM());
- break;
- case CSS_RECT:
- result = CSSPrimitiveValue::create(m_value.rect->cloneForCSSOM());
- break;
- case CSS_QUAD:
- result = CSSPrimitiveValue::create(m_value.quad->cloneForCSSOM());
- break;
-#if ENABLE(CSS_SCROLL_SNAP)
- case CSS_LENGTH_REPEAT:
- result = CSSPrimitiveValue::create(m_value.lengthRepeat->cloneForCSSOM());
- break;
-#endif
- case CSS_PAIR:
- // Pair is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(Ref<Pair>(*m_value.pair));
- break;
-#if ENABLE(DASHBOARD_SUPPORT)
- case CSS_DASHBOARD_REGION:
- // DashboardRegion is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(RefPtr<DashboardRegion>(m_value.region));
- break;
-#endif
- case CSS_CALC:
- // CSSCalcValue is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(RefPtr<CSSCalcValue>(m_value.calc));
- break;
- case CSS_SHAPE:
- // CSSShapeValue is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(Ref<CSSBasicShape>(*m_value.shape));
- break;
- case CSS_NUMBER:
- case CSS_PERCENTAGE:
- case CSS_EMS:
- case CSS_QUIRKY_EMS:
- case CSS_EXS:
- case CSS_REMS:
- case CSS_CHS:
- case CSS_PX:
- case CSS_CM:
- case CSS_MM:
- case CSS_IN:
- case CSS_PT:
- case CSS_PC:
- case CSS_DEG:
- case CSS_RAD:
- case CSS_GRAD:
- case CSS_MS:
- case CSS_S:
- case CSS_HZ:
- case CSS_KHZ:
- case CSS_TURN:
- case CSS_VW:
- case CSS_VH:
- case CSS_VMIN:
- case CSS_VMAX:
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- case CSS_DPPX:
- case CSS_DPI:
- case CSS_DPCM:
-#endif
- case CSS_FR:
- result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitType>(m_primitiveUnitType));
- break;
- case CSS_PROPERTY_ID:
- result = CSSPrimitiveValue::createIdentifier(m_value.propertyID);
- break;
- case CSS_VALUE_ID:
- result = CSSPrimitiveValue::createIdentifier(m_value.valueID);
- break;
- case CSS_RGBCOLOR:
- result = CSSPrimitiveValue::create(*m_value.color);
- break;
- case CSS_DIMENSION:
- case CSS_UNKNOWN:
- ASSERT_NOT_REACHED();
- break;
- }
-
- result->setCSSOMSafe();
- return result.releaseNonNull();
-}
-
</del><span class="cx"> bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
</span><span class="cx"> {
</span><span class="cx"> if (m_primitiveUnitType != other.m_primitiveUnitType)
</span><span class="lines">@@ -1348,4 +1251,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<DeprecatedCSSOMPrimitiveValue> CSSPrimitiveValue::createDeprecatedCSSOMPrimitiveWrapper() const
+{
+ return DeprecatedCSSOMPrimitiveValue::create(*this);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> class CSSToLengthConversionData;
</span><span class="cx"> class Counter;
</span><span class="cx"> class DashboardRegion;
</span><ins>+class DeprecatedCSSOMPrimitiveValue;
</ins><span class="cx"> class LengthRepeat;
</span><span class="cx"> class Pair;
</span><span class="cx"> class Quad;
</span><span class="lines">@@ -289,9 +290,6 @@
</span><span class="cx"> // FIXME-NEWPARSER: Can ditch the boolean and just use the unit type once old parser is gone.
</span><span class="cx"> bool isQuirkValue() const { return m_isQuirkValue || primitiveType() == CSS_QUIRKY_EMS; }
</span><span class="cx">
</span><del>- Ref<CSSPrimitiveValue> cloneForCSSOM() const;
- void setCSSOMSafe() { m_isCSSOMSafe = true; }
-
</del><span class="cx"> bool equals(const CSSPrimitiveValue&) const;
</span><span class="cx">
</span><span class="cx"> static UnitType canonicalUnitTypeForCategory(UnitCategory);
</span><span class="lines">@@ -299,6 +297,8 @@
</span><span class="cx">
</span><span class="cx"> static double computeNonCalcLengthDouble(const CSSToLengthConversionData&, UnitType, double value);
</span><span class="cx">
</span><ins>+ Ref<DeprecatedCSSOMPrimitiveValue> createDeprecatedCSSOMPrimitiveWrapper() const;
+
</ins><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSPrimitiveValue.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- ImplementationLacksVTable,
-] interface CSSPrimitiveValue : CSSValue {
- // UnitTypes
- const unsigned short CSS_UNKNOWN = 0;
- const unsigned short CSS_NUMBER = 1;
- const unsigned short CSS_PERCENTAGE = 2;
- const unsigned short CSS_EMS = 3;
- const unsigned short CSS_EXS = 4;
- const unsigned short CSS_PX = 5;
- const unsigned short CSS_CM = 6;
- const unsigned short CSS_MM = 7;
- const unsigned short CSS_IN = 8;
- const unsigned short CSS_PT = 9;
- const unsigned short CSS_PC = 10;
- const unsigned short CSS_DEG = 11;
- const unsigned short CSS_RAD = 12;
- const unsigned short CSS_GRAD = 13;
- const unsigned short CSS_MS = 14;
- const unsigned short CSS_S = 15;
- const unsigned short CSS_HZ = 16;
- const unsigned short CSS_KHZ = 17;
- const unsigned short CSS_DIMENSION = 18;
- const unsigned short CSS_STRING = 19;
- const unsigned short CSS_URI = 20;
- const unsigned short CSS_IDENT = 21;
- const unsigned short CSS_ATTR = 22;
- const unsigned short CSS_COUNTER = 23;
- const unsigned short CSS_RECT = 24;
- const unsigned short CSS_RGBCOLOR = 25;
- const unsigned short CSS_VW = 26;
- const unsigned short CSS_VH = 27;
- const unsigned short CSS_VMIN = 28;
- const unsigned short CSS_VMAX = 29;
-
- readonly attribute unsigned short primitiveType;
-
- [MayThrowException] void setFloatValue(optional unsigned short unitType = 0, optional unrestricted float floatValue = NaN);
- [MayThrowException] unrestricted float getFloatValue(optional unsigned short unitType = 0);
-
- [MayThrowException] void setStringValue(optional unsigned short stringType = 0, optional DOMString stringValue);
- [MayThrowException] DOMString getStringValue();
-
- [MayThrowException] Counter getCounterValue();
- [MayThrowException] Rect getRectValue();
- [MayThrowException] RGBColor getRGBColorValue();
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleDeclaration.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSStyleDeclaration.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "DeprecatedCSSOMValue.h"
</ins><span class="cx"> #include "ExceptionOr.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx"> virtual ExceptionOr<void> setCssText(const String&) = 0;
</span><span class="cx"> virtual unsigned length() const = 0;
</span><span class="cx"> virtual String item(unsigned index) const = 0;
</span><del>- virtual RefPtr<CSSValue> getPropertyCSSValue(const String& propertyName) = 0;
</del><ins>+ virtual RefPtr<DeprecatedCSSOMValue> getPropertyCSSValue(const String& propertyName) = 0;
</ins><span class="cx"> virtual String getPropertyValue(const String& propertyName) = 0;
</span><span class="cx"> virtual String getPropertyPriority(const String& propertyName) = 0;
</span><span class="cx"> virtual String getPropertyShorthand(const String& propertyName) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleDeclarationidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleDeclaration.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSStyleDeclaration.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx"> [CEReactions, SetterMayThrowException] attribute DOMString cssText;
</span><span class="cx">
</span><span class="cx"> DOMString getPropertyValue(DOMString propertyName);
</span><del>- [Custom] CSSValue? getPropertyCSSValue(DOMString propertyName);
</del><span class="cx">
</span><ins>+ // This method is deprecated, and we would like to drop support for it someday
+ [Custom] DeprecatedCSSOMValue? getPropertyCSSValue(DOMString propertyName);
+
</ins><span class="cx"> [CEReactions, MayThrowException] DOMString removeProperty(DOMString propertyName);
</span><span class="cx"> DOMString? getPropertyPriority(DOMString propertyName);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -68,6 +68,9 @@
</span><span class="cx"> #include "CSSGridTemplateAreasValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include "DeprecatedCSSOMValueList.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsCSSValue : public RefCounted<SameSizeAsCSSValue> {
</span><span class="lines">@@ -76,26 +79,6 @@
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(CSSValue) == sizeof(SameSizeAsCSSValue), CSS_value_should_stay_small);
</span><span class="cx">
</span><del>-class TextCloneCSSValue final : public CSSValue {
-public:
- static Ref<TextCloneCSSValue> create(ClassType classType, const String& text)
- {
- return adoptRef(*new TextCloneCSSValue(classType, text));
- }
-
- String cssText() const { return m_cssText; }
-
-private:
- TextCloneCSSValue(ClassType classType, const String& text)
- : CSSValue(classType, /*isCSSOMSafe*/ true)
- , m_cssText(text)
- {
- m_isTextClone = true;
- }
-
- String m_cssText;
-};
-
</del><span class="cx"> bool CSSValue::isImplicitInitialValue() const
</span><span class="cx"> {
</span><span class="cx"> return m_classType == InitialClass && downcast<CSSInitialValue>(*this).isImplicit();
</span><span class="lines">@@ -120,9 +103,6 @@
</span><span class="cx">
</span><span class="cx"> bool CSSValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const
</span><span class="cx"> {
</span><del>- // This should get called for internal instances only.
- ASSERT(!isCSSOMSafe());
-
</del><span class="cx"> if (is<CSSValueList>(*this))
</span><span class="cx"> return downcast<CSSValueList>(*this).traverseSubresources(handler);
</span><span class="cx"> if (is<CSSFontFaceSrcValue>(*this))
</span><span class="lines">@@ -146,11 +126,6 @@
</span><span class="cx">
</span><span class="cx"> bool CSSValue::equals(const CSSValue& other) const
</span><span class="cx"> {
</span><del>- if (m_isTextClone) {
- ASSERT(isCSSOMSafe());
- return static_cast<const TextCloneCSSValue*>(this)->cssText() == other.cssText();
- }
-
</del><span class="cx"> if (m_classType == other.m_classType) {
</span><span class="cx"> switch (m_classType) {
</span><span class="cx"> case AspectRatioClass:
</span><span class="lines">@@ -248,12 +223,6 @@
</span><span class="cx">
</span><span class="cx"> String CSSValue::cssText() const
</span><span class="cx"> {
</span><del>- if (m_isTextClone) {
- ASSERT(isCSSOMSafe());
- return static_cast<const TextCloneCSSValue*>(this)->cssText();
- }
- ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
-
</del><span class="cx"> switch (classType()) {
</span><span class="cx"> case AspectRatioClass:
</span><span class="cx"> return downcast<CSSAspectRatioValue>(*this).customCSSText();
</span><span class="lines">@@ -347,13 +316,6 @@
</span><span class="cx">
</span><span class="cx"> void CSSValue::destroy()
</span><span class="cx"> {
</span><del>- if (m_isTextClone) {
- ASSERT(isCSSOMSafe());
- delete static_cast<TextCloneCSSValue*>(this);
- return;
- }
- ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
-
</del><span class="cx"> switch (classType()) {
</span><span class="cx"> case AspectRatioClass:
</span><span class="cx"> delete downcast<CSSAspectRatioValue>(this);
</span><span class="lines">@@ -482,22 +444,15 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSValue::cloneForCSSOM() const
</del><ins>+Ref<DeprecatedCSSOMValue> CSSValue::createDeprecatedCSSOMWrapper() const
</ins><span class="cx"> {
</span><del>- switch (classType()) {
- case PrimitiveClass:
- return downcast<CSSPrimitiveValue>(*this).cloneForCSSOM();
- case ValueListClass:
- return downcast<CSSValueList>(*this).cloneForCSSOM();
- case ImageClass:
- case CursorImageClass:
- return downcast<CSSImageValue>(*this).cloneForCSSOM();
- case ImageSetClass:
- return downcast<CSSImageSetValue>(*this).cloneForCSSOM();
- default:
- ASSERT(!isSubtypeExposedToCSSOM());
- return TextCloneCSSValue::create(classType(), cssText());
- }
</del><ins>+ if (isImageValue() || isCursorImageValue())
+ return downcast<CSSImageValue>(this)->createDeprecatedCSSOMWrapper();
+ if (isPrimitiveValue())
+ return DeprecatedCSSOMPrimitiveValue::create(downcast<CSSPrimitiveValue>(*this));
+ if (isValueList())
+ return DeprecatedCSSOMValueList::create(downcast<CSSValueList>(*this));
+ return DeprecatedCSSOMComplexValue::create(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSValue::treatAsInheritedValue(CSSPropertyID propertyID) const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -32,15 +32,11 @@
</span><span class="cx">
</span><span class="cx"> class CSSCustomPropertyValue;
</span><span class="cx"> class CachedResource;
</span><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> class StyleSheetContents;
</span><span class="cx">
</span><span class="cx"> enum CSSPropertyID : uint16_t;
</span><span class="cx">
</span><del>-// FIXME: The current CSSValue and subclasses should be turned into internal types (StyleValue).
-// The few subtypes that are actually exposed in CSSOM can be seen in the cloneForCSSOM() function.
-// They should be handled by separate wrapper classes.
-
-// Please don't expose more CSSValue types to the web.
</del><span class="cx"> class CSSValue : public RefCounted<CSSValue> {
</span><span class="cx"> public:
</span><span class="cx"> enum Type {
</span><span class="lines">@@ -61,12 +57,9 @@
</span><span class="cx"> destroy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT Type cssValueType() const;
</del><ins>+ Type cssValueType() const;
+ String cssText() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT String cssText() const;
-
- ExceptionOr<void> setCssText(const String&) { return { }; } // FIXME: Not implemented.
-
</del><span class="cx"> bool isPrimitiveValue() const { return m_classType == PrimitiveClass; }
</span><span class="cx"> bool isValueList() const { return m_classType >= ValueListClass; }
</span><span class="cx">
</span><span class="lines">@@ -126,14 +119,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasVariableReferences() const { return isVariableReferenceValue() || isPendingSubstitutionValue(); }
</span><span class="cx">
</span><del>- bool isCSSOMSafe() const { return m_isCSSOMSafe; }
- bool isSubtypeExposedToCSSOM() const
- {
- return isPrimitiveValue() || isValueList();
- }
</del><ins>+ Ref<DeprecatedCSSOMValue> createDeprecatedCSSOMWrapper() const;
</ins><span class="cx">
</span><del>- RefPtr<CSSValue> cloneForCSSOM() const;
-
</del><span class="cx"> bool traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const;
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSValue&) const;
</span><span class="lines">@@ -210,6 +197,7 @@
</span><span class="cx"> // Do not append non-list class types here.
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+public:
</ins><span class="cx"> static const size_t ValueListSeparatorBits = 2;
</span><span class="cx"> enum ValueListSeparator {
</span><span class="cx"> SpaceSeparator,
</span><span class="lines">@@ -217,12 +205,11 @@
</span><span class="cx"> SlashSeparator
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+protected:
</ins><span class="cx"> ClassType classType() const { return static_cast<ClassType>(m_classType); }
</span><span class="cx">
</span><del>- explicit CSSValue(ClassType classType, bool isCSSOMSafe = false)
- : m_isCSSOMSafe(isCSSOMSafe)
- , m_isTextClone(false)
- , m_primitiveUnitType(0)
</del><ins>+ explicit CSSValue(ClassType classType)
+ : m_primitiveUnitType(0)
</ins><span class="cx"> , m_hasCachedCSSText(false)
</span><span class="cx"> , m_isQuirkValue(false)
</span><span class="cx"> , m_valueListSeparator(SpaceSeparator)
</span><span class="lines">@@ -239,8 +226,6 @@
</span><span class="cx"> WEBCORE_EXPORT void destroy();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- unsigned m_isCSSOMSafe : 1;
- unsigned m_isTextClone : 1;
</del><span class="cx"> // The bits in this section are only used by specific subclasses but kept here
</span><span class="cx"> // to maximize struct packing.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSValue.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValue.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- CustomIsReachable,
- CustomToJSObject,
- ExportToWrappedFunction,
- ImplementationLacksVTable,
- JSCustomFinalize,
-] interface CSSValue {
- // UnitTypes
- const unsigned short CSS_INHERIT = 0;
- const unsigned short CSS_PRIMITIVE_VALUE = 1;
- const unsigned short CSS_VALUE_LIST = 2;
- const unsigned short CSS_CUSTOM = 3;
-
- [SetterMayThrowException] attribute DOMString? cssText;
-
- readonly attribute unsigned short cssValueType;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValueList.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><ins>+#include "DeprecatedCSSOMValue.h"
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -144,18 +145,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSValueList::CSSValueList(const CSSValueList& cloneFrom)
- : CSSValue(cloneFrom.classType(), /* isCSSOMSafe */ true)
-{
- m_valueListSeparator = cloneFrom.m_valueListSeparator;
- m_values.reserveInitialCapacity(cloneFrom.m_values.size());
- for (unsigned i = 0, size = cloneFrom.m_values.size(); i < size; ++i)
- m_values.uncheckedAppend(*cloneFrom.m_values[i]->cloneForCSSOM());
-}
-
-Ref<CSSValueList> CSSValueList::cloneForCSSOM() const
-{
- return adoptRef(*new CSSValueList(*this));
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValueList.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -69,12 +69,11 @@
</span><span class="cx"> bool equals(const CSSValue&) const;
</span><span class="cx">
</span><span class="cx"> bool traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const;
</span><del>-
- Ref<CSSValueList> cloneForCSSOM() const;
</del><span class="cx">
</span><ins>+ unsigned separator() const { return m_valueListSeparator; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> CSSValueList(ClassType, ValueListSeparator);
</span><del>- CSSValueList(const CSSValueList& cloneFrom);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit CSSValueList(ValueListSeparator);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSValueList.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/CSSValueList.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 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.
- */
-
-// Introduced in DOM Level 2:
-[
- ImplementationLacksVTable,
-] interface CSSValueList : CSSValue {
- readonly attribute unsigned long length;
- getter CSSValue item(unsigned long index);
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCorecssCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/Counter.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Counter.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/Counter.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> String listStyle() const { return m_listStyle->stringValue(); }
</span><span class="cx"> String separator() const { return m_separator->stringValue(); }
</span><span class="cx">
</span><ins>+ const CSSPrimitiveValue& identifierValue() const { return m_identifier; }
+ const CSSPrimitiveValue& listStyleValue() const { return m_listStyle; }
+ const CSSPrimitiveValue& separatorValue() const { return m_separator; }
+
</ins><span class="cx"> CSSValueID listStyleIdent() const { return m_listStyle->valueID(); }
</span><span class="cx">
</span><span class="cx"> void setIdentifier(Ref<CSSPrimitiveValue>&& identifier) { m_identifier = WTFMove(identifier); }
</span><span class="lines">@@ -48,11 +52,6 @@
</span><span class="cx"> && listStyle() == other.listStyle()
</span><span class="cx"> && separator() == other.separator();
</span><span class="cx"> }
</span><del>-
- Ref<Counter> cloneForCSSOM() const
- {
- return create(m_identifier->cloneForCSSOM(), m_listStyle->cloneForCSSOM(), m_separator->cloneForCSSOM());
- }
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Counter(Ref<CSSPrimitiveValue>&& identifier, Ref<CSSPrimitiveValue>&& listStyle, Ref<CSSPrimitiveValue>&& separator)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCounteridl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/Counter.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Counter.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/Counter.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- ExportToWrappedFunction,
- ImplementationLacksVTable,
-] interface Counter {
- readonly attribute DOMString identifier;
- readonly attribute DOMString listStyle;
- readonly attribute DOMString separator;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMCounterh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMCounter.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMCounter.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMCounter.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "Counter.h"
+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include <wtf/RefPtr.h>
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+class DeprecatedCSSOMCounter final : public RefCounted<DeprecatedCSSOMCounter> {
+public:
+ static Ref<DeprecatedCSSOMCounter> create(const Counter& counter) { return adoptRef(*new DeprecatedCSSOMCounter(counter)); }
+
+ String identifier() const { return m_identifier->stringValue(); }
+ String listStyle() const { return m_listStyle->stringValue(); }
+ String separator() const { return m_separator->stringValue(); }
+
+private:
+ DeprecatedCSSOMCounter(const Counter& counter)
+ : m_identifier(counter.identifierValue().createDeprecatedCSSOMPrimitiveWrapper())
+ , m_listStyle(counter.listStyleValue().createDeprecatedCSSOMPrimitiveWrapper())
+ , m_separator(counter.separatorValue().createDeprecatedCSSOMPrimitiveWrapper())
+ {
+ }
+
+ Ref<DeprecatedCSSOMPrimitiveValue> m_identifier;
+ Ref<DeprecatedCSSOMPrimitiveValue> m_listStyle;
+ Ref<DeprecatedCSSOMPrimitiveValue> m_separator;
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMCounteridlfromrev209968trunkSourceWebCorecssCounteridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMCounter.idl (from rev 209968, trunk/Source/WebCore/css/Counter.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMCounter.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMCounter.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ ExportToWrappedFunction,
+ ImplementationLacksVTable,
+ InterfaceName=Counter
+] interface DeprecatedCSSOMCounter {
+ readonly attribute DOMString identifier;
+ readonly attribute DOMString listStyle;
+ readonly attribute DOMString separator;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValuecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.cpp (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.cpp (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2016 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 "DeprecatedCSSOMPrimitiveValue.h"
+
+#include "DeprecatedCSSOMCounter.h"
+#include "DeprecatedCSSOMRGBColor.h"
+#include "DeprecatedCSSOMRect.h"
+#include "ExceptionCode.h"
+
+namespace WebCore {
+
+// FIXME: For now these still call into CSSPrimitiveValue, but as we refactor into subclasses
+// such as StyleCounterValue, StyleRectValue, and StyleColorValue, these methods will get
+// more complicated.
+
+ExceptionOr<Ref<DeprecatedCSSOMCounter>> DeprecatedCSSOMPrimitiveValue::getCounterValue() const
+{
+ ExceptionOr<Counter&> counter = m_value->getCounterValue();
+ if (counter.hasException())
+ return Exception { INVALID_ACCESS_ERR };
+ return DeprecatedCSSOMCounter::create(counter.releaseReturnValue());
+}
+
+ExceptionOr<Ref<DeprecatedCSSOMRect>> DeprecatedCSSOMPrimitiveValue::getRectValue() const
+{
+ ExceptionOr<Rect&> rect = m_value->getRectValue();
+ if (rect.hasException())
+ return Exception { INVALID_ACCESS_ERR };
+ return DeprecatedCSSOMRect::create(rect.releaseReturnValue());
+}
+
+ExceptionOr<Ref<DeprecatedCSSOMRGBColor>> DeprecatedCSSOMPrimitiveValue::getRGBColorValue() const
+{
+ ExceptionOr<Ref<RGBColor>> color = m_value->getRGBColorValue();
+ if (color.hasException())
+ return Exception { INVALID_ACCESS_ERR };
+ return DeprecatedCSSOMRGBColor::create(color.releaseReturnValue());
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValueh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "CSSPrimitiveValue.h"
+#include "DeprecatedCSSOMValue.h"
+
+namespace WebCore {
+
+class DeprecatedCSSOMCounter;
+class DeprecatedCSSOMRGBColor;
+class DeprecatedCSSOMRect;
+
+class DeprecatedCSSOMPrimitiveValue : public DeprecatedCSSOMValue {
+public:
+ // Only expose what's in the IDL file.
+ enum UnitType {
+ CSS_UNKNOWN = 0,
+ CSS_NUMBER = 1,
+ CSS_PERCENTAGE = 2,
+ CSS_EMS = 3,
+ CSS_EXS = 4,
+ CSS_PX = 5,
+ CSS_CM = 6,
+ CSS_MM = 7,
+ CSS_IN = 8,
+ CSS_PT = 9,
+ CSS_PC = 10,
+ CSS_DEG = 11,
+ CSS_RAD = 12,
+ CSS_GRAD = 13,
+ CSS_MS = 14,
+ CSS_S = 15,
+ CSS_HZ = 16,
+ CSS_KHZ = 17,
+ CSS_DIMENSION = 18,
+ CSS_STRING = 19,
+ CSS_URI = 20,
+ CSS_IDENT = 21,
+ CSS_ATTR = 22,
+ CSS_COUNTER = 23,
+ CSS_RECT = 24,
+ CSS_RGBCOLOR = 25,
+ CSS_VW = 26,
+ CSS_VH = 27,
+ CSS_VMIN = 28,
+ CSS_VMAX = 29
+ };
+
+ static Ref<DeprecatedCSSOMPrimitiveValue> create(const CSSPrimitiveValue& value)
+ {
+ return adoptRef(*new DeprecatedCSSOMPrimitiveValue(value));
+ }
+
+ bool equals(const DeprecatedCSSOMPrimitiveValue& other) const { return m_value->equals(other.m_value); }
+ unsigned cssValueType() const { return m_value->cssValueType(); }
+ String cssText() const { return m_value->cssText(); }
+
+ // FIXME: Eventually these will contain more code and not just call through to
+ // CSSPrimitiveValue.
+ WEBCORE_EXPORT unsigned short primitiveType() const { return m_value->primitiveType(); }
+ WEBCORE_EXPORT ExceptionOr<void> setFloatValue(unsigned short unitType, double floatValue) { return m_value->setFloatValue(unitType, floatValue); }
+ WEBCORE_EXPORT ExceptionOr<float> getFloatValue(unsigned short unitType) const { return m_value->getFloatValue(unitType); }
+ WEBCORE_EXPORT ExceptionOr<void> setStringValue(unsigned short stringType, const String& stringValue) { return m_value->setStringValue(stringType, stringValue); }
+ WEBCORE_EXPORT ExceptionOr<String> getStringValue() const { return m_value->getStringValue(); }
+ WEBCORE_EXPORT ExceptionOr<Ref<DeprecatedCSSOMCounter>> getCounterValue() const;
+ WEBCORE_EXPORT ExceptionOr<Ref<DeprecatedCSSOMRect>> getRectValue() const;
+ WEBCORE_EXPORT ExceptionOr<Ref<DeprecatedCSSOMRGBColor>> getRGBColorValue() const;
+
+ String stringValue() const { return m_value->stringValue(); }
+
+protected:
+ DeprecatedCSSOMPrimitiveValue(const CSSPrimitiveValue& value)
+ : DeprecatedCSSOMValue(DeprecatedPrimitiveValueClass)
+ , m_value(const_cast<CSSPrimitiveValue&>(value))
+ {
+ }
+
+private:
+ Ref<CSSPrimitiveValue> m_value;
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSSOM_VALUE(DeprecatedCSSOMPrimitiveValue, isPrimitiveValue())
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMPrimitiveValueidlfromrev209968trunkSourceWebCorecssCSSPrimitiveValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.idl (from rev 209968, trunk/Source/WebCore/css/CSSPrimitiveValue.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ ImplementationLacksVTable,
+ InterfaceName=CSSPrimitiveValue
+] interface DeprecatedCSSOMPrimitiveValue : DeprecatedCSSOMValue {
+ // UnitTypes
+ const unsigned short CSS_UNKNOWN = 0;
+ const unsigned short CSS_NUMBER = 1;
+ const unsigned short CSS_PERCENTAGE = 2;
+ const unsigned short CSS_EMS = 3;
+ const unsigned short CSS_EXS = 4;
+ const unsigned short CSS_PX = 5;
+ const unsigned short CSS_CM = 6;
+ const unsigned short CSS_MM = 7;
+ const unsigned short CSS_IN = 8;
+ const unsigned short CSS_PT = 9;
+ const unsigned short CSS_PC = 10;
+ const unsigned short CSS_DEG = 11;
+ const unsigned short CSS_RAD = 12;
+ const unsigned short CSS_GRAD = 13;
+ const unsigned short CSS_MS = 14;
+ const unsigned short CSS_S = 15;
+ const unsigned short CSS_HZ = 16;
+ const unsigned short CSS_KHZ = 17;
+ const unsigned short CSS_DIMENSION = 18;
+ const unsigned short CSS_STRING = 19;
+ const unsigned short CSS_URI = 20;
+ const unsigned short CSS_IDENT = 21;
+ const unsigned short CSS_ATTR = 22;
+ const unsigned short CSS_COUNTER = 23;
+ const unsigned short CSS_RECT = 24;
+ const unsigned short CSS_RGBCOLOR = 25;
+ const unsigned short CSS_VW = 26;
+ const unsigned short CSS_VH = 27;
+ const unsigned short CSS_VMIN = 28;
+ const unsigned short CSS_VMAX = 29;
+
+ readonly attribute unsigned short primitiveType;
+
+ [MayThrowException] void setFloatValue(optional unsigned short unitType = 0, optional unrestricted float floatValue = NaN);
+ [MayThrowException] unrestricted float getFloatValue(optional unsigned short unitType = 0);
+
+ [MayThrowException] void setStringValue(optional unsigned short stringType = 0, optional DOMString stringValue);
+ [MayThrowException] DOMString getStringValue();
+
+ [MayThrowException] DeprecatedCSSOMCounter getCounterValue();
+ [MayThrowException] DeprecatedCSSOMRect getRectValue();
+ [MayThrowException] DeprecatedCSSOMRGBColor getRGBColorValue();
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMRGBColorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+/*
+ * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include "RGBColor.h"
+#include <wtf/RefPtr.h>
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+class DeprecatedCSSOMRGBColor final : public RefCounted<DeprecatedCSSOMRGBColor> {
+public:
+ static Ref<DeprecatedCSSOMRGBColor> create(const RGBColor& color) { return adoptRef(*new DeprecatedCSSOMRGBColor(color)); }
+
+ DeprecatedCSSOMPrimitiveValue* red() { return m_red.get(); }
+ DeprecatedCSSOMPrimitiveValue* green() { return m_green.get(); }
+ DeprecatedCSSOMPrimitiveValue* blue() { return m_blue.get(); }
+ DeprecatedCSSOMPrimitiveValue* alpha() { return m_alpha.get(); }
+
+ Color color() const { return Color(m_rgbColor); }
+
+private:
+ DeprecatedCSSOMRGBColor(const RGBColor& color)
+ : m_rgbColor(color.rgbColor())
+ {
+ // Red
+ unsigned value = (m_rgbColor >> 16) & 0xFF;
+ auto result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
+ m_red = result->createDeprecatedCSSOMPrimitiveWrapper();
+
+ // Green
+ value = (m_rgbColor >> 8) & 0xFF;
+ result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
+ m_green = result->createDeprecatedCSSOMPrimitiveWrapper();
+
+ // Blue
+ value = m_rgbColor & 0xFF;
+ result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
+ m_blue = result->createDeprecatedCSSOMPrimitiveWrapper();
+
+ // Alpha
+ float alphaValue = static_cast<float>((m_rgbColor >> 24) & 0xFF) / 0xFF;
+ result = CSSPrimitiveValue::create(alphaValue, CSSPrimitiveValue::CSS_NUMBER);
+ m_alpha = result->createDeprecatedCSSOMPrimitiveWrapper();
+ }
+
+ RGBA32 m_rgbColor;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_red;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_green;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_blue;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_alpha;
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMRGBColoridlfromrev209968trunkSourceWebCorecssRGBColoridl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.idl (from rev 209968, trunk/Source/WebCore/css/RGBColor.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMRGBColor.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ ExportToWrappedFunction,
+ ImplementationLacksVTable,
+ InterfaceName=RGBColor
+] interface DeprecatedCSSOMRGBColor {
+ readonly attribute DeprecatedCSSOMPrimitiveValue red;
+ readonly attribute DeprecatedCSSOMPrimitiveValue green;
+ readonly attribute DeprecatedCSSOMPrimitiveValue blue;
+
+ readonly attribute DeprecatedCSSOMPrimitiveValue alpha;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMRecth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMRect.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMRect.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMRect.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include "Rect.h"
+#include <wtf/RefPtr.h>
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+class DeprecatedCSSOMRect final : public RefCounted<DeprecatedCSSOMRect> {
+public:
+ static Ref<DeprecatedCSSOMRect> create(const Rect& rect) { return adoptRef(*new DeprecatedCSSOMRect(rect)); }
+
+ DeprecatedCSSOMPrimitiveValue* top() const { return m_top.get(); }
+ DeprecatedCSSOMPrimitiveValue* right() const { return m_right.get(); }
+ DeprecatedCSSOMPrimitiveValue* bottom() const { return m_bottom.get(); }
+ DeprecatedCSSOMPrimitiveValue* left() const { return m_left.get(); }
+
+private:
+ DeprecatedCSSOMRect(const Rect& rect)
+ {
+ if (rect.top())
+ m_top = rect.top()->createDeprecatedCSSOMPrimitiveWrapper();
+ if (rect.right())
+ m_right = rect.right()->createDeprecatedCSSOMPrimitiveWrapper();
+ if (rect.bottom())
+ m_bottom = rect.bottom()->createDeprecatedCSSOMPrimitiveWrapper();
+ if (rect.left())
+ m_left = rect.left()->createDeprecatedCSSOMPrimitiveWrapper();
+ }
+
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_top;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_right;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_bottom;
+ RefPtr<DeprecatedCSSOMPrimitiveValue> m_left;
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMRectidlfromrev209968trunkSourceWebCorecssRectidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMRect.idl (from rev 209968, trunk/Source/WebCore/css/Rect.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMRect.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMRect.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ ExportToWrappedFunction,
+ ImplementationLacksVTable,
+ InterfaceName=Rect
+] interface DeprecatedCSSOMRect {
+ readonly attribute DeprecatedCSSOMPrimitiveValue top;
+ readonly attribute DeprecatedCSSOMPrimitiveValue right;
+ readonly attribute DeprecatedCSSOMPrimitiveValue bottom;
+ readonly attribute DeprecatedCSSOMPrimitiveValue left;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValuecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMValue.cpp (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValue.cpp (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+/*
+ * Copyright (C) 2016 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 "DeprecatedCSSOMValue.h"
+
+#include "DeprecatedCSSOMPrimitiveValue.h"
+#include "DeprecatedCSSOMValueList.h"
+
+namespace WebCore {
+
+template<class ChildClassType>
+inline static bool compareCSSOMValues(const DeprecatedCSSOMValue& first, const DeprecatedCSSOMValue& second)
+{
+ return static_cast<const ChildClassType&>(first).equals(static_cast<const ChildClassType&>(second));
+}
+
+bool DeprecatedCSSOMValue::equals(const DeprecatedCSSOMValue& other) const
+{
+ if (m_classType == other.m_classType) {
+ switch (m_classType) {
+ case DeprecatedComplexValueClass:
+ return compareCSSOMValues<DeprecatedCSSOMComplexValue>(*this, other);
+ case DeprecatedPrimitiveValueClass:
+ return compareCSSOMValues<DeprecatedCSSOMPrimitiveValue>(*this, other);
+ case DeprecatedValueListClass:
+ return compareCSSOMValues<DeprecatedCSSOMValueList>(*this, other);
+ }
+ }
+ return false;
+}
+
+void DeprecatedCSSOMValue::destroy()
+{
+ switch (classType()) {
+ case DeprecatedComplexValueClass: {
+ delete downcast<DeprecatedCSSOMComplexValue>(this);
+ return;
+ }
+ case DeprecatedPrimitiveValueClass: {
+ delete downcast<DeprecatedCSSOMPrimitiveValue>(this);
+ return;
+ }
+ case DeprecatedValueListClass: {
+ delete downcast<DeprecatedCSSOMValueList>(this);
+ return;
+ }
+ }
+ ASSERT_NOT_REACHED();
+ delete this;
+}
+
+unsigned DeprecatedCSSOMValue::cssValueType() const
+{
+ switch (m_classType) {
+ case DeprecatedComplexValueClass:
+ return downcast<DeprecatedCSSOMComplexValue>(*this).cssValueType();
+ case DeprecatedPrimitiveValueClass:
+ return downcast<DeprecatedCSSOMPrimitiveValue>(*this).cssValueType();
+ case DeprecatedValueListClass:
+ return downcast<DeprecatedCSSOMValueList>(*this).cssValueType();
+ }
+ ASSERT_NOT_REACHED();
+ return CSS_CUSTOM;
+}
+
+String DeprecatedCSSOMValue::cssText() const
+{
+ switch (m_classType) {
+ case DeprecatedComplexValueClass:
+ return downcast<DeprecatedCSSOMComplexValue>(*this).cssText();
+ case DeprecatedPrimitiveValueClass:
+ return downcast<DeprecatedCSSOMPrimitiveValue>(*this).cssText();
+ case DeprecatedValueListClass:
+ return downcast<DeprecatedCSSOMValueList>(*this).cssText();
+ }
+ ASSERT_NOT_REACHED();
+ return "";
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValueh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMValue.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValue.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValue.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,130 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "CSSValue.h"
+#include "ExceptionOr.h"
+#include <wtf/HashMap.h>
+#include <wtf/ListHashSet.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+#include <wtf/TypeCasts.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class DeprecatedCSSOMValue : public RefCounted<DeprecatedCSSOMValue> {
+public:
+ // Exactly match the IDL. No reason to add anything if it's not in the IDL.
+ enum Type {
+ CSS_INHERIT = 0,
+ CSS_PRIMITIVE_VALUE = 1,
+ CSS_VALUE_LIST = 2,
+ CSS_CUSTOM = 3
+ };
+
+ // Override RefCounted's deref() to ensure operator delete is called on
+ // the appropriate subclass type.
+ void deref()
+ {
+ if (derefBase())
+ destroy();
+ }
+
+ WEBCORE_EXPORT unsigned cssValueType() const;
+
+ WEBCORE_EXPORT String cssText() const;
+ ExceptionOr<void> setCssText(const String&) { return { }; } // Will never implement.
+
+ bool equals(const DeprecatedCSSOMValue& other) const;
+ bool operator==(const DeprecatedCSSOMValue& other) const { return equals(other); }
+
+ bool isComplexValue() const { return m_classType == DeprecatedComplexValueClass; }
+ bool isPrimitiveValue() const { return m_classType == DeprecatedPrimitiveValueClass; }
+ bool isValueList() const { return m_classType == DeprecatedValueListClass; }
+
+protected:
+ static const size_t ClassTypeBits = 2;
+ enum DeprecatedClassType {
+ DeprecatedComplexValueClass,
+ DeprecatedPrimitiveValueClass,
+ DeprecatedValueListClass
+ };
+
+ DeprecatedClassType classType() const { return static_cast<DeprecatedClassType>(m_classType); }
+
+ DeprecatedCSSOMValue(DeprecatedClassType classType)
+ : m_classType(classType)
+ {
+ }
+
+ // NOTE: This class is non-virtual for memory and performance reasons.
+ // Don't go making it virtual again unless you know exactly what you're doing!
+ ~DeprecatedCSSOMValue() { }
+
+private:
+ WEBCORE_EXPORT void destroy();
+
+protected:
+ unsigned m_valueListSeparator : CSSValue::ValueListSeparatorBits;
+
+private:
+ unsigned m_classType : ClassTypeBits; // ClassType
+};
+
+class DeprecatedCSSOMComplexValue : public DeprecatedCSSOMValue {
+public:
+ static Ref<DeprecatedCSSOMComplexValue> create(const CSSValue& value)
+ {
+ return adoptRef(*new DeprecatedCSSOMComplexValue(value));
+ }
+
+ bool equals(const DeprecatedCSSOMComplexValue& other) const { return m_value->equals(other.m_value); }
+ String cssText() const { return m_value->cssText(); }
+
+ unsigned cssValueType() const { return m_value->cssValueType(); }
+
+protected:
+ DeprecatedCSSOMComplexValue(const CSSValue& value)
+ : DeprecatedCSSOMValue(DeprecatedComplexValueClass)
+ , m_value(const_cast<CSSValue&>(value))
+ {
+ }
+
+private:
+ Ref<CSSValue> m_value;
+};
+
+} // namespace WebCore
+
+#define SPECIALIZE_TYPE_TRAITS_CSSOM_VALUE(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+static bool isType(const WebCore::DeprecatedCSSOMValue& value) { return value.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_CSSOM_VALUE(DeprecatedCSSOMComplexValue, isComplexValue())
+
+
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValueidlfromrev209968trunkSourceWebCorecssCSSValueidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMValue.idl (from rev 209968, trunk/Source/WebCore/css/CSSValue.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValue.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValue.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ CustomIsReachable,
+ CustomToJSObject,
+ ExportToWrappedFunction,
+ ImplementationLacksVTable,
+ JSCustomFinalize,
+ InterfaceName=CSSValue
+] interface DeprecatedCSSOMValue {
+ // UnitTypes
+ const unsigned short CSS_INHERIT = 0;
+ const unsigned short CSS_PRIMITIVE_VALUE = 1;
+ const unsigned short CSS_VALUE_LIST = 2;
+ const unsigned short CSS_CUSTOM = 3;
+
+ [SetterMayThrowException] attribute DOMString? cssText;
+
+ readonly attribute unsigned short cssValueType;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValueListcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMValueList.cpp (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValueList.cpp (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValueList.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+/*
+ * Copyright (C) 2016 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 "DeprecatedCSSOMValueList.h"
+
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+bool DeprecatedCSSOMValueList::equals(const DeprecatedCSSOMValueList& other) const
+{
+ if (m_valueListSeparator != other.m_valueListSeparator)
+ return false;
+
+ if (m_values.size() != other.m_values.size())
+ return false;
+
+ for (unsigned i = 0, size = m_values.size(); i < size; ++i) {
+ if (!m_values[i].get().equals(other.m_values[i]))
+ return false;
+ }
+ return true;
+}
+
+String DeprecatedCSSOMValueList::cssText() const
+{
+ StringBuilder result;
+ String separator;
+ switch (m_valueListSeparator) {
+ case CSSValue::SpaceSeparator:
+ separator = ASCIILiteral(" ");
+ break;
+ case CSSValue::CommaSeparator:
+ separator = ASCIILiteral(", ");
+ break;
+ case CSSValue::SlashSeparator:
+ separator = ASCIILiteral(" / ");
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ for (auto& value : m_values) {
+ if (!result.isEmpty())
+ result.append(separator);
+ result.append(value.get().cssText());
+ }
+
+ return result.toString();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValueListh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/DeprecatedCSSOMValueList.h (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValueList.h (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValueList.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "CSSValueList.h"
+#include "DeprecatedCSSOMValue.h"
+
+namespace WebCore {
+
+class DeprecatedCSSOMValueList : public DeprecatedCSSOMValue {
+public:
+ static Ref<DeprecatedCSSOMValueList> create(const CSSValueList& value)
+ {
+ return adoptRef(*new DeprecatedCSSOMValueList(value));
+ }
+
+ bool equals(const DeprecatedCSSOMValueList& other) const;
+ unsigned cssValueType() const { return CSS_VALUE_LIST; }
+ String cssText() const;
+
+ size_t length() const { return m_values.size(); }
+ DeprecatedCSSOMValue* item(size_t index) { return index < m_values.size() ? m_values[index].ptr() : nullptr; }
+ const DeprecatedCSSOMValue* item(size_t index) const { return index < m_values.size() ? m_values[index].ptr() : nullptr; }
+
+protected:
+ DeprecatedCSSOMValueList(const CSSValueList& value)
+ : DeprecatedCSSOMValue(DeprecatedValueListClass)
+ {
+ m_valueListSeparator = value.separator();
+ m_values.reserveInitialCapacity(value.length());
+ for (unsigned i = 0, size = value.length(); i < size; ++i)
+ m_values.uncheckedAppend(value.itemWithoutBoundsCheck(i)->createDeprecatedCSSOMWrapper());
+ }
+
+private:
+ Vector<Ref<DeprecatedCSSOMValue>, 4> m_values;
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSSOM_VALUE(DeprecatedCSSOMValueList, isValueList())
</ins></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedCSSOMValueListidlfromrev209968trunkSourceWebCorecssCSSValueListidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/DeprecatedCSSOMValueList.idl (from rev 209968, trunk/Source/WebCore/css/CSSValueList.idl) (0 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedCSSOMValueList.idl (rev 0)
+++ trunk/Source/WebCore/css/DeprecatedCSSOMValueList.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2007 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.
+ */
+
+// Introduced in DOM Level 2:
+[
+ ImplementationLacksVTable,
+ InterfaceName=CSSValueList
+] interface DeprecatedCSSOMValueList : DeprecatedCSSOMValue {
+ readonly attribute unsigned long length;
+ getter DeprecatedCSSOMValue item(unsigned long index);
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCorecssLengthRepeath"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/LengthRepeat.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/LengthRepeat.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/LengthRepeat.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<LengthRepeat> create(PassRefPtr<CSSValue> interval) { return adoptRef(*new LengthRepeat(interval)); }
</span><span class="cx">
</span><del>- Ref<LengthRepeat> cloneForCSSOM() const { return create(interval()); }
-
</del><span class="cx"> CSSValue* interval() const { return m_interval.get(); }
</span><span class="cx">
</span><span class="cx"> void setInterval(PassRefPtr<CSSValue> interval) { m_interval = interval; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -175,19 +175,19 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> PropertySetCSSStyleDeclaration::getPropertyCSSValue(const String& propertyName)
</del><ins>+RefPtr<DeprecatedCSSOMValue> PropertySetCSSStyleDeclaration::getPropertyCSSValue(const String& propertyName)
</ins><span class="cx"> {
</span><span class="cx"> if (isCustomPropertyName(propertyName)) {
</span><span class="cx"> RefPtr<CSSValue> value = m_propertySet->getCustomPropertyCSSValue(propertyName);
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><del>- return cloneAndCacheForCSSOM(value.get());
</del><ins>+ return wrapForDeprecatedCSSOM(value.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSPropertyID propertyID = cssPropertyID(propertyName);
</span><span class="cx"> if (!propertyID)
</span><span class="cx"> return nullptr;
</span><del>- return cloneAndCacheForCSSOM(getPropertyCSSValueInternal(propertyID).get());
</del><ins>+ return wrapForDeprecatedCSSOM(getPropertyCSSValueInternal(propertyID).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String PropertySetCSSStyleDeclaration::getPropertyValue(const String& propertyName)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> return changed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSValue* PropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM(CSSValue* internalValue)
</del><ins>+DeprecatedCSSOMValue* PropertySetCSSStyleDeclaration::wrapForDeprecatedCSSOM(CSSValue* internalValue)
</ins><span class="cx"> {
</span><span class="cx"> if (!internalValue)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -320,12 +320,12 @@
</span><span class="cx">
</span><span class="cx"> // The map is here to maintain the object identity of the CSSValues over multiple invocations.
</span><span class="cx"> // FIXME: It is likely that the identity is not important for web compatibility and this code should be removed.
</span><del>- if (!m_cssomCSSValueClones)
- m_cssomCSSValueClones = std::make_unique<HashMap<CSSValue*, RefPtr<CSSValue>>>();
</del><ins>+ if (!m_cssomValueWrappers)
+ m_cssomValueWrappers = std::make_unique<HashMap<CSSValue*, RefPtr<DeprecatedCSSOMValue>>>();
</ins><span class="cx">
</span><del>- RefPtr<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, RefPtr<CSSValue>()).iterator->value;
</del><ins>+ RefPtr<DeprecatedCSSOMValue>& clonedValue = m_cssomValueWrappers->add(internalValue, RefPtr<DeprecatedCSSOMValue>()).iterator->value;
</ins><span class="cx"> if (!clonedValue)
</span><del>- clonedValue = internalValue->cloneForCSSOM();
</del><ins>+ clonedValue = internalValue->createDeprecatedCSSOMWrapper();
</ins><span class="cx"> return clonedValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> ASSERT(m_parentRule->parentStyleSheet());
</span><span class="cx">
</span><span class="cx"> if (type == PropertyChanged)
</span><del>- m_cssomCSSValueClones = nullptr;
</del><ins>+ m_cssomValueWrappers = nullptr;
</ins><span class="cx">
</span><span class="cx"> // Style sheet mutation needs to be signaled even if the change failed. willMutate*/didMutate* must pair.
</span><span class="cx"> m_parentRule->parentStyleSheet()->didMutateRuleFromCSSStyleDeclaration();
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> if (type == NoChanges)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_cssomCSSValueClones = nullptr;
</del><ins>+ m_cssomValueWrappers = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_parentElement)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> class CSSRule;
</span><span class="cx"> class CSSProperty;
</span><span class="cx"> class CSSValue;
</span><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> class MutableStyleProperties;
</span><span class="cx"> class StyleSheetContents;
</span><span class="cx"> class StyledElement;
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> virtual CSSParserContext cssParserContext() const;
</span><span class="cx">
</span><span class="cx"> MutableStyleProperties* m_propertySet;
</span><del>- std::unique_ptr<HashMap<CSSValue*, RefPtr<CSSValue>>> m_cssomCSSValueClones;
</del><ins>+ std::unique_ptr<HashMap<CSSValue*, RefPtr<DeprecatedCSSOMValue>>> m_cssomValueWrappers;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void ref() override;
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> CSSRule* parentRule() const override { return nullptr; }
</span><span class="cx"> unsigned length() const final;
</span><span class="cx"> String item(unsigned index) const final;
</span><del>- RefPtr<CSSValue> getPropertyCSSValue(const String& propertyName) final;
</del><ins>+ RefPtr<DeprecatedCSSOMValue> getPropertyCSSValue(const String& propertyName) final;
</ins><span class="cx"> String getPropertyValue(const String& propertyName) final;
</span><span class="cx"> String getPropertyPriority(const String& propertyName) final;
</span><span class="cx"> String getPropertyShorthand(const String& propertyName) final;
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<MutableStyleProperties> copyProperties() const final;
</span><span class="cx">
</span><del>- CSSValue* cloneAndCacheForCSSOM(CSSValue*);
</del><ins>+ DeprecatedCSSOMValue* wrapForDeprecatedCSSOM(CSSValue*);
</ins><span class="cx">
</span><span class="cx"> virtual bool willMutate() WARN_UNUSED_RETURN { return true; }
</span><span class="cx"> virtual void didMutate(MutationType) { }
</span></span></pre></div>
<a id="trunkSourceWebCorecssRGBColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RGBColor.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RGBColor.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/RGBColor.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -35,37 +35,5 @@
</span><span class="cx"> return adoptRef(*new RGBColor(rgbColor));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSPrimitiveValue> RGBColor::red()
-{
- unsigned value = (m_rgbColor >> 16) & 0xFF;
- Ref<CSSPrimitiveValue> result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
- result->setCSSOMSafe();
- return result;
-}
-
-Ref<CSSPrimitiveValue> RGBColor::green()
-{
- unsigned value = (m_rgbColor >> 8) & 0xFF;
- Ref<CSSPrimitiveValue> result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
- result->setCSSOMSafe();
- return result;
-}
-
-Ref<CSSPrimitiveValue> RGBColor::blue()
-{
- unsigned value = m_rgbColor & 0xFF;
- Ref<CSSPrimitiveValue> result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
- result->setCSSOMSafe();
- return result;
-}
-
-Ref<CSSPrimitiveValue> RGBColor::alpha()
-{
- float value = static_cast<float>((m_rgbColor >> 24) & 0xFF) / 0xFF;
- Ref<CSSPrimitiveValue> result = CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
- result->setCSSOMSafe();
- return result;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssRGBColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RGBColor.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RGBColor.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/RGBColor.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -37,13 +37,10 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<RGBColor> create(unsigned rgbColor);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT Ref<CSSPrimitiveValue> red();
- WEBCORE_EXPORT Ref<CSSPrimitiveValue> green();
- WEBCORE_EXPORT Ref<CSSPrimitiveValue> blue();
- WEBCORE_EXPORT Ref<CSSPrimitiveValue> alpha();
-
</del><span class="cx"> Color color() const { return Color(m_rgbColor); }
</span><span class="cx">
</span><ins>+ RGBA32 rgbColor() const { return m_rgbColor; }
+
</ins><span class="cx"> private:
</span><span class="cx"> RGBColor(unsigned rgbColor)
</span><span class="cx"> : m_rgbColor(rgbColor)
</span></span></pre></div>
<a id="trunkSourceWebCorecssRGBColoridl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/RGBColor.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RGBColor.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/RGBColor.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- ExportToWrappedFunction,
- ImplementationLacksVTable,
-] interface RGBColor {
- readonly attribute CSSPrimitiveValue red;
- readonly attribute CSSPrimitiveValue green;
- readonly attribute CSSPrimitiveValue blue;
-
- readonly attribute CSSPrimitiveValue alpha;
-};
</del></span></pre></div>
<a id="trunkSourceWebCorecssRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/Rect.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Rect.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/Rect.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -48,14 +48,6 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> RectBase() { }
</span><del>- RectBase(const RectBase& cloneFrom)
- : m_top(cloneFrom.m_top ? RefPtr<CSSPrimitiveValue>(cloneFrom.m_top->cloneForCSSOM()) : nullptr)
- , m_right(cloneFrom.m_right ? RefPtr<CSSPrimitiveValue>(cloneFrom.m_right->cloneForCSSOM()) : nullptr)
- , m_bottom(cloneFrom.m_bottom ? RefPtr<CSSPrimitiveValue>(cloneFrom.m_bottom->cloneForCSSOM()) : nullptr)
- , m_left(cloneFrom.m_left ? RefPtr<CSSPrimitiveValue>(cloneFrom.m_left->cloneForCSSOM()) : nullptr)
- {
- }
-
</del><span class="cx"> ~RectBase() { }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -68,8 +60,6 @@
</span><span class="cx"> class Rect final : public RectBase, public RefCounted<Rect> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<Rect> create() { return adoptRef(*new Rect); }
</span><del>-
- Ref<Rect> cloneForCSSOM() const { return adoptRef(*new Rect(*this)); }
</del><span class="cx">
</span><span class="cx"> String cssText() const
</span><span class="cx"> {
</span><span class="lines">@@ -78,7 +68,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Rect() { }
</span><del>- Rect(const Rect& cloneFrom) : RectBase(cloneFrom), RefCounted<Rect>() { }
</del><span class="cx"> static String generateCSSString(const String& top, const String& right, const String& bottom, const String& left)
</span><span class="cx"> {
</span><span class="cx"> return "rect(" + top + ", " + right + ", " + bottom + ", " + left + ')';
</span><span class="lines">@@ -88,8 +77,6 @@
</span><span class="cx"> class Quad final : public RectBase, public RefCounted<Quad> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<Quad> create() { return adoptRef(*new Quad); }
</span><del>-
- Ref<Quad> cloneForCSSOM() const { return adoptRef(*new Quad(*this)); }
</del><span class="cx">
</span><span class="cx"> String cssText() const
</span><span class="cx"> {
</span><span class="lines">@@ -98,7 +85,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Quad() { }
</span><del>- Quad(const Quad& cloneFrom) : RectBase(cloneFrom), RefCounted<Quad>() { }
</del><span class="cx"> static String generateCSSString(const String& top, const String& right, const String& bottom, const String& left)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span></span></pre></div>
<a id="trunkSourceWebCorecssRectidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/Rect.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Rect.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/css/Rect.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- ExportToWrappedFunction,
- ImplementationLacksVTable,
-] interface Rect {
- readonly attribute CSSPrimitiveValue top;
- readonly attribute CSSPrimitiveValue right;
- readonly attribute CSSPrimitiveValue bottom;
- readonly attribute CSSPrimitiveValue left;
-};
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSPropertyParser.h"
</span><ins>+#include "DeprecatedCSSOMValue.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "Event.h"
</span><span class="lines">@@ -1023,7 +1024,7 @@
</span><span class="cx"> invalidateInstances();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> SVGElement::getPresentationAttribute(const String& name)
</del><ins>+RefPtr<DeprecatedCSSOMValue> SVGElement::getPresentationAttribute(const String& name)
</ins><span class="cx"> {
</span><span class="cx"> if (!hasAttributesWithoutUpdate())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1036,8 +1037,10 @@
</span><span class="cx"> RefPtr<MutableStyleProperties> style = MutableStyleProperties::create(SVGAttributeMode);
</span><span class="cx"> CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(attribute->name());
</span><span class="cx"> style->setProperty(propertyID, attribute->value());
</span><del>- RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(propertyID);
- return cssValue ? cssValue->cloneForCSSOM() : nullptr;
</del><ins>+ auto cssValue = style->getPropertyCSSValue(propertyID);
+ if (!cssValue)
+ return nullptr;
+ return cssValue->createDeprecatedCSSOMWrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGElement::instanceUpdatesBlocked() const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/svg/SVGElement.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class AffineTransform;
</span><span class="cx"> class CSSStyleDeclaration;
</span><del>-class CSSValue;
</del><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> class Document;
</span><span class="cx"> class SVGAttributeToPropertyMap;
</span><span class="cx"> class SVGDocumentExtensions;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> static bool isAnimatableCSSProperty(const QualifiedName&);
</span><span class="cx"> bool isPresentationAttributeWithSVGDOM(const QualifiedName&);
</span><span class="cx"> bool isKnownAttribute(const QualifiedName&);
</span><del>- RefPtr<CSSValue> getPresentationAttribute(const String& name);
</del><ins>+ RefPtr<DeprecatedCSSOMValue> getPresentationAttribute(const String& name);
</ins><span class="cx"> virtual bool supportsMarkers() const { return false; }
</span><span class="cx"> bool hasRelativeLengths() const { return !m_elementsWithRelativeLengths.isEmpty(); }
</span><span class="cx"> virtual bool needsPendingResourceHandling() const { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.idl (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.idl 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebCore/svg/SVGElement.idl 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> attribute long tabIndex;
</span><span class="cx">
</span><span class="cx"> // FIXME: Using "undefined" as default parameter value is wrong.
</span><del>- CSSValue getPresentationAttribute(optional DOMString name = "undefined");
</del><ins>+ // This method is deprecated, and we'd like to remove it someday.
+ DeprecatedCSSOMValue getPresentationAttribute(optional DOMString name = "undefined");
</ins><span class="cx">
</span><span class="cx"> void focus();
</span><span class="cx"> void blur();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-12-16 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
+ https://bugs.webkit.org/show_bug.cgi?id=165968
+
+ Reviewed by Andreas Kling.
+
+ * DOM/DOMCSS.mm:
+ (kitClass):
+ * DOM/DOMCSSPrimitiveValue.mm:
+ (-[DOMCSSPrimitiveValue getCounterValue]):
+ (-[DOMCSSPrimitiveValue getRectValue]):
+ (kit):
+ * DOM/DOMCSSPrimitiveValueInternal.h:
+ * DOM/DOMCSSStyleDeclaration.mm:
+ * DOM/DOMCSSValue.mm:
+ (kit):
+ * DOM/DOMCSSValueInternal.h:
+ * DOM/DOMCSSValueList.mm:
+ * DOM/DOMCounter.mm:
+ (kit):
+ * DOM/DOMCounterInternal.h:
+ * DOM/DOMRGBColor.mm:
+ (kit):
+ * DOM/DOMRGBColorInternal.h:
+ * DOM/DOMRect.mm:
+ (kit):
+ * DOM/DOMRectInternal.h:
+ * DOM/DOMUtility.mm:
+ (createDOMWrapper):
+
</ins><span class="cx"> 2016-12-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTML form validation bubble should be dismissed on navigation
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSS.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSS.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSS.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebCore/CSSRule.h>
</span><span class="cx"> #import <WebCore/CSSStyleSheet.h>
</span><del>-#import <WebCore/CSSValue.h>
</del><ins>+#import <WebCore/DeprecatedCSSOMValue.h>
</ins><span class="cx"> #import "DOMCSSCharsetRule.h"
</span><span class="cx"> #import "DOMCSSFontFaceRule.h"
</span><span class="cx"> #import "DOMCSSImportRule.h"
</span><span class="lines">@@ -94,20 +94,16 @@
</span><span class="cx"> //------------------------------------------------------------------------------------------
</span><span class="cx"> // DOMCSSValue
</span><span class="cx">
</span><del>-Class kitClass(WebCore::CSSValue* impl)
</del><ins>+Class kitClass(WebCore::DeprecatedCSSOMValue* impl)
</ins><span class="cx"> {
</span><span class="cx"> switch (impl->cssValueType()) {
</span><del>- case WebCore::CSSValue::CSS_PRIMITIVE_VALUE:
- return [DOMCSSPrimitiveValue class];
- case WebCore::CSSValue::CSS_VALUE_LIST:
- return [DOMCSSValueList class];
- case WebCore::CSSValue::CSS_INHERIT:
- case WebCore::CSSValue::CSS_INITIAL:
- case WebCore::CSSValue::CSS_UNSET:
- case WebCore::CSSValue::CSS_REVERT:
- return [DOMCSSValue class];
- case WebCore::CSSValue::CSS_CUSTOM:
- return [DOMCSSValue class];
</del><ins>+ case WebCore::DeprecatedCSSOMValue::CSS_PRIMITIVE_VALUE:
+ return [DOMCSSPrimitiveValue class];
+ case WebCore::DeprecatedCSSOMValue::CSS_VALUE_LIST:
+ return [DOMCSSValueList class];
+ case WebCore::DeprecatedCSSOMValue::CSS_INHERIT:
+ case WebCore::DeprecatedCSSOMValue::CSS_CUSTOM:
+ return [DOMCSSValue class];
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSPrimitiveValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValue.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValue.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValue.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,8 +25,10 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMCSSPrimitiveValueInternal.h"
</span><span class="cx">
</span><del>-#import <WebCore/CSSPrimitiveValue.h>
-#import <WebCore/Counter.h>
</del><ins>+#import <WebCore/DeprecatedCSSOMCounter.h>
+#import <WebCore/DeprecatedCSSOMPrimitiveValue.h>
+#import <WebCore/DeprecatedCSSOMRGBColor.h>
+#import <WebCore/DeprecatedCSSOMRect.h>
</ins><span class="cx"> #import "DOMCSSValueInternal.h"
</span><span class="cx"> #import "DOMCounterInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="lines">@@ -34,14 +36,12 @@
</span><span class="cx"> #import "DOMRectInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><del>-#import <WebCore/RGBColor.h>
-#import <WebCore/Rect.h>
</del><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <wtf/GetPtr.h>
</span><span class="cx">
</span><del>-#define IMPL static_cast<WebCore::CSSPrimitiveValue*>(reinterpret_cast<WebCore::CSSValue*>(_internal))
</del><ins>+#define IMPL static_cast<WebCore::DeprecatedCSSOMPrimitiveValue*>(reinterpret_cast<WebCore::DeprecatedCSSOMValue*>(_internal))
</ins><span class="cx">
</span><span class="cx"> @implementation DOMCSSPrimitiveValue
</span><span class="cx">
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx"> - (DOMCounter *)getCounterValue
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return kit(&raiseOnDOMError(IMPL->getCounterValue()));
</del><ins>+ return kit(raiseOnDOMError(IMPL->getCounterValue()).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMRect *)getRectValue
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return kit(&raiseOnDOMError(IMPL->getRectValue()));
</del><ins>+ return kit(raiseOnDOMError(IMPL->getRectValue()).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMRGBColor *)getRGBColorValue
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-DOMCSSPrimitiveValue *kit(WebCore::CSSPrimitiveValue* value)
</del><ins>+DOMCSSPrimitiveValue *kit(WebCore::DeprecatedCSSOMPrimitiveValue* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><del>- return static_cast<DOMCSSPrimitiveValue*>(kit(static_cast<WebCore::CSSValue*>(value)));
</del><ins>+ return static_cast<DOMCSSPrimitiveValue*>(kit(static_cast<WebCore::DeprecatedCSSOMValue*>(value)));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSPrimitiveValueInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValueInternal.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValueInternal.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSPrimitiveValueInternal.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import <WebKitLegacy/DOMCSSPrimitiveValue.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class CSSPrimitiveValue;
</del><ins>+class DeprecatedCSSOMPrimitiveValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DOMCSSPrimitiveValue *kit(WebCore::CSSPrimitiveValue*);
</del><ins>+DOMCSSPrimitiveValue *kit(WebCore::DeprecatedCSSOMPrimitiveValue*);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSStyleDeclarationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSStyleDeclaration.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSStyleDeclaration.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSStyleDeclaration.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import <WebCore/CSSImportRule.h>
</span><span class="cx"> #import <WebCore/CSSRule.h>
</span><span class="cx"> #import <WebCore/CSSStyleDeclaration.h>
</span><del>-#import <WebCore/CSSValue.h>
</del><ins>+#import <WebCore/DeprecatedCSSOMValue.h>
</ins><span class="cx"> #import "DOMCSSRuleInternal.h"
</span><span class="cx"> #import "DOMCSSValueInternal.h"
</span><span class="cx"> #import "DOMInternal.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSValue.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSValue.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSValue.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMCSSValueInternal.h"
</span><span class="cx">
</span><del>-#import <WebCore/CSSValue.h>
</del><ins>+#import <WebCore/DeprecatedCSSOMValue.h>
</ins><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <wtf/GetPtr.h>
</span><span class="cx">
</span><del>-#define IMPL reinterpret_cast<WebCore::CSSValue*>(_internal)
</del><ins>+#define IMPL reinterpret_cast<WebCore::DeprecatedCSSOMValue*>(_internal)
</ins><span class="cx">
</span><span class="cx"> @implementation DOMCSSValue
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-DOMCSSValue *kit(WebCore::CSSValue* value)
</del><ins>+DOMCSSValue *kit(WebCore::DeprecatedCSSOMValue* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><span class="cx"> if (!value)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSValueInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSValueInternal.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSValueInternal.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSValueInternal.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #import <WebKitLegacy/DOMCSSValue.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class CSSValue;
</del><ins>+class DeprecatedCSSOMValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DOMCSSValue *kit(WebCore::CSSValue*);
-Class kitClass(WebCore::CSSValue*);
</del><ins>+DOMCSSValue *kit(WebCore::DeprecatedCSSOMValue*);
+Class kitClass(WebCore::DeprecatedCSSOMValue*);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSValueListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSValueList.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSValueList.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSValueList.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,17 +25,16 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMCSSValueList.h"
</span><span class="cx">
</span><del>-#import <WebCore/CSSValue.h>
-#import <WebCore/CSSValueList.h>
</del><span class="cx"> #import "DOMCSSValueInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><ins>+#import <WebCore/DeprecatedCSSOMValueList.h>
</ins><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <wtf/GetPtr.h>
</span><span class="cx">
</span><del>-#define IMPL static_cast<WebCore::CSSValueList*>(reinterpret_cast<WebCore::CSSValue*>(_internal))
</del><ins>+#define IMPL static_cast<WebCore::DeprecatedCSSOMValueList*>(reinterpret_cast<WebCore::DeprecatedCSSOMValue*>(_internal))
</ins><span class="cx">
</span><span class="cx"> @implementation DOMCSSValueList
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCountermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCounter.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCounter.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCounter.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMCounterInternal.h"
</span><span class="cx">
</span><del>-#import <WebCore/Counter.h>
</del><ins>+#import <WebCore/DeprecatedCSSOMCounter.h>
</ins><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <wtf/GetPtr.h>
</span><span class="cx">
</span><del>-#define IMPL reinterpret_cast<WebCore::Counter*>(_internal)
</del><ins>+#define IMPL reinterpret_cast<WebCore::DeprecatedCSSOMCounter*>(_internal)
</ins><span class="cx">
</span><span class="cx"> @implementation DOMCounter
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-DOMCounter *kit(WebCore::Counter* value)
</del><ins>+DOMCounter *kit(WebCore::DeprecatedCSSOMCounter* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><span class="cx"> if (!value)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCounterInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCounterInternal.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCounterInternal.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMCounterInternal.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import <WebKitLegacy/DOMCounter.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class Counter;
</del><ins>+class DeprecatedCSSOMCounter;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DOMCounter *kit(WebCore::Counter*);
</del><ins>+DOMCounter *kit(WebCore::DeprecatedCSSOMCounter*);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMRGBColormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMRGBColor.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMRGBColor.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMRGBColor.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMRGBColorInternal.h"
</span><span class="cx">
</span><del>-#import <WebCore/CSSPrimitiveValue.h>
</del><span class="cx"> #import "DOMCSSPrimitiveValueInternal.h"
</span><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><ins>+#import <WebCore/DeprecatedCSSOMPrimitiveValue.h>
+#import <WebCore/DeprecatedCSSOMRGBColor.h>
</ins><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><del>-#import <WebCore/RGBColor.h>
</del><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #import <WebCore/ColorSpace.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define IMPL reinterpret_cast<WebCore::RGBColor*>(_internal)
</del><ins>+#define IMPL reinterpret_cast<WebCore::DeprecatedCSSOMRGBColor*>(_internal)
</ins><span class="cx">
</span><span class="cx"> @implementation DOMRGBColor
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-DOMRGBColor *kit(WebCore::RGBColor* value)
</del><ins>+DOMRGBColor *kit(WebCore::DeprecatedCSSOMRGBColor* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><span class="cx"> if (!value)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMRGBColorInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMRGBColorInternal.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMRGBColorInternal.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMRGBColorInternal.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import <WebKitLegacy/DOMRGBColor.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class RGBColor;
</del><ins>+class DeprecatedCSSOMRGBColor;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DOMRGBColor *kit(WebCore::RGBColor*);
</del><ins>+DOMRGBColor *kit(WebCore::DeprecatedCSSOMRGBColor*);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMRectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMRect.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMRect.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMRect.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -25,19 +25,19 @@
</span><span class="cx">
</span><span class="cx"> #import "DOMRectInternal.h"
</span><span class="cx">
</span><del>-#import <WebCore/CSSPrimitiveValue.h>
</del><span class="cx"> #import "DOMCSSPrimitiveValueInternal.h"
</span><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "ExceptionHandlers.h"
</span><ins>+#import <WebCore/DeprecatedCSSOMPrimitiveValue.h>
+#import <WebCore/DeprecatedCSSOMRect.h>
</ins><span class="cx"> #import <WebCore/JSMainThreadExecState.h>
</span><del>-#import <WebCore/Rect.h>
</del><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <wtf/GetPtr.h>
</span><span class="cx">
</span><del>-#define IMPL reinterpret_cast<WebCore::Rect*>(_internal)
</del><ins>+#define IMPL reinterpret_cast<WebCore::DeprecatedCSSOMRect*>(_internal)
</ins><span class="cx">
</span><span class="cx"> @implementation DOMRect
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-DOMRect *kit(WebCore::Rect* value)
</del><ins>+DOMRect *kit(WebCore::DeprecatedCSSOMRect* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><span class="cx"> if (!value)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMRectInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMRectInternal.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMRectInternal.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMRectInternal.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import <WebKitLegacy/DOMRect.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class Rect;
</del><ins>+class DeprecatedCSSOMRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DOMRect *kit(WebCore::Rect*);
</del><ins>+DOMRect *kit(WebCore::DeprecatedCSSOMRect*);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMUtilitymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMUtility.mm (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMUtility.mm 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit/mac/DOM/DOMUtility.mm 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -50,10 +50,12 @@
</span><span class="cx"> #import <WebCore/JSCSSRule.h>
</span><span class="cx"> #import <WebCore/JSCSSRuleList.h>
</span><span class="cx"> #import <WebCore/JSCSSStyleDeclaration.h>
</span><del>-#import <WebCore/JSCSSValue.h>
-#import <WebCore/JSCounter.h>
</del><span class="cx"> #import <WebCore/JSDOMImplementation.h>
</span><span class="cx"> #import <WebCore/JSDOMWindowShell.h>
</span><ins>+#import <WebCore/JSDeprecatedCSSOMCounter.h>
+#import <WebCore/JSDeprecatedCSSOMRGBColor.h>
+#import <WebCore/JSDeprecatedCSSOMRect.h>
+#import <WebCore/JSDeprecatedCSSOMValue.h>
</ins><span class="cx"> #import <WebCore/JSEvent.h>
</span><span class="cx"> #import <WebCore/JSHTMLCollection.h>
</span><span class="cx"> #import <WebCore/JSHTMLOptionsCollection.h>
</span><span class="lines">@@ -62,9 +64,7 @@
</span><span class="cx"> #import <WebCore/JSNode.h>
</span><span class="cx"> #import <WebCore/JSNodeIterator.h>
</span><span class="cx"> #import <WebCore/JSNodeList.h>
</span><del>-#import <WebCore/JSRGBColor.h>
</del><span class="cx"> #import <WebCore/JSRange.h>
</span><del>-#import <WebCore/JSRect.h>
</del><span class="cx"> #import <WebCore/JSStyleSheet.h>
</span><span class="cx"> #import <WebCore/JSStyleSheetList.h>
</span><span class="cx"> #import <WebCore/JSTreeWalker.h>
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> WRAP(CSSRule)
</span><span class="cx"> WRAP(CSSRuleList)
</span><span class="cx"> WRAP(CSSStyleDeclaration)
</span><del>- WRAP(CSSValue)
- WRAP(Counter)
</del><ins>+ WRAP(DeprecatedCSSOMValue)
+ WRAP(DeprecatedCSSOMCounter)
</ins><span class="cx"> WRAP(DOMImplementation)
</span><span class="cx"> WRAP(DOMWindowShell)
</span><span class="cx"> WRAP(Event)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> WRAP(Node)
</span><span class="cx"> WRAP(NodeIterator)
</span><span class="cx"> WRAP(NodeList)
</span><del>- WRAP(RGBColor)
</del><ins>+ WRAP(DeprecatedCSSOMRGBColor)
</ins><span class="cx"> WRAP(Range)
</span><del>- WRAP(Rect)
</del><ins>+ WRAP(DeprecatedCSSOMRect)
</ins><span class="cx"> WRAP(StyleSheet)
</span><span class="cx"> WRAP(StyleSheetList)
</span><span class="cx"> WRAP(TreeWalker)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-16 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
+ https://bugs.webkit.org/show_bug.cgi?id=165968
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp:
+ (WebKit::kit):
+ (WebKit::core):
+ (WebKit::wrapCSSValue):
+ (webkit_dom_css_value_constructor):
+ (webkit_dom_css_value_get_css_text):
+ (webkit_dom_css_value_set_css_text):
+ (webkit_dom_css_value_get_css_value_type):
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h:
+
</ins><span class="cx"> 2016-12-17 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Visual viewports: bottom fixed elements disappear behind the keyboard
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValue.cpp 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -35,12 +35,12 @@
</span><span class="cx"> #define WEBKIT_DOM_CSS_VALUE_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_CSS_VALUE, WebKitDOMCSSValuePrivate)
</span><span class="cx">
</span><span class="cx"> typedef struct _WebKitDOMCSSValuePrivate {
</span><del>- RefPtr<WebCore::CSSValue> coreObject;
</del><ins>+ RefPtr<WebCore::DeprecatedCSSOMValue> coreObject;
</ins><span class="cx"> } WebKitDOMCSSValuePrivate;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebKitDOMCSSValue* kit(WebCore::CSSValue* obj)
</del><ins>+WebKitDOMCSSValue* kit(WebCore::DeprecatedCSSOMValue* obj)
</ins><span class="cx"> {
</span><span class="cx"> if (!obj)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> return wrapCSSValue(obj);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::CSSValue* core(WebKitDOMCSSValue* request)
</del><ins>+WebCore::DeprecatedCSSOMValue* core(WebKitDOMCSSValue* request)
</ins><span class="cx"> {
</span><del>- return request ? static_cast<WebCore::CSSValue*>(WEBKIT_DOM_OBJECT(request)->coreObject) : 0;
</del><ins>+ return request ? static_cast<WebCore::DeprecatedCSSOMValue*>(WEBKIT_DOM_OBJECT(request)->coreObject) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMCSSValue* wrapCSSValue(WebCore::CSSValue* coreObject)
</del><ins>+WebKitDOMCSSValue* wrapCSSValue(WebCore::DeprecatedCSSOMValue* coreObject)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(coreObject);
</span><span class="cx"> return WEBKIT_DOM_CSS_VALUE(g_object_new(WEBKIT_DOM_TYPE_CSS_VALUE, "core-object", coreObject, nullptr));
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> GObject* object = G_OBJECT_CLASS(webkit_dom_css_value_parent_class)->constructor(type, constructPropertiesCount, constructProperties);
</span><span class="cx">
</span><span class="cx"> WebKitDOMCSSValuePrivate* priv = WEBKIT_DOM_CSS_VALUE_GET_PRIVATE(object);
</span><del>- priv->coreObject = static_cast<WebCore::CSSValue*>(WEBKIT_DOM_OBJECT(object)->coreObject);
</del><ins>+ priv->coreObject = static_cast<WebCore::DeprecatedCSSOMValue*>(WEBKIT_DOM_OBJECT(object)->coreObject);
</ins><span class="cx"> WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
</span><span class="cx">
</span><span class="cx"> return object;
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_CSS_VALUE(self), 0);
</span><del>- WebCore::CSSValue* item = WebKit::core(self);
</del><ins>+ WebCore::DeprecatedCSSOMValue* item = WebKit::core(self);
</ins><span class="cx"> gchar* result = convertToUTF8String(item->cssText());
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_CSS_VALUE(self));
</span><span class="cx"> g_return_if_fail(value);
</span><span class="cx"> g_return_if_fail(!error || !*error);
</span><del>- WebCore::CSSValue* item = WebKit::core(self);
</del><ins>+ WebCore::DeprecatedCSSOMValue* item = WebKit::core(self);
</ins><span class="cx"> WTF::String convertedValue = WTF::String::fromUTF8(value);
</span><span class="cx"> auto result = item->setCssText(convertedValue);
</span><span class="cx"> if (result.hasException()) {
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_CSS_VALUE(self), 0);
</span><del>- WebCore::CSSValue* item = WebKit::core(self);
</del><ins>+ WebCore::DeprecatedCSSOMValue* item = WebKit::core(self);
</ins><span class="cx"> gushort result = item->cssValueType();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkDOMWebKitDOMCSSValuePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h (209968 => 209969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h 2016-12-17 19:32:45 UTC (rev 209968)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSValuePrivate.h 2016-12-17 20:08:34 UTC (rev 209969)
</span><span class="lines">@@ -20,13 +20,13 @@
</span><span class="cx"> #ifndef WebKitDOMCSSValuePrivate_h
</span><span class="cx"> #define WebKitDOMCSSValuePrivate_h
</span><span class="cx">
</span><del>-#include <WebCore/CSSValue.h>
</del><ins>+#include <WebCore/DeprecatedCSSOMValue.h>
</ins><span class="cx"> #include <webkitdom/WebKitDOMCSSValue.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-WebKitDOMCSSValue* wrapCSSValue(WebCore::CSSValue*);
-WebKitDOMCSSValue* kit(WebCore::CSSValue*);
-WebCore::CSSValue* core(WebKitDOMCSSValue*);
</del><ins>+WebKitDOMCSSValue* wrapCSSValue(WebCore::DeprecatedCSSOMValue*);
+WebKitDOMCSSValue* kit(WebCore::DeprecatedCSSOMValue*);
+WebCore::DeprecatedCSSOMValue* core(WebKitDOMCSSValue*);
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif /* WebKitDOMCSSValuePrivate_h */
</span></span></pre>
</div>
</div>
</body>
</html>