<!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>[194851] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194851">194851</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-01-11 08:33:30 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix MSVC build after <a href="http://trac.webkit.org/projects/webkit/changeset/194848">r194848</a>.
Since MSVC refuses to recognize the friendship between LazyNeverDestroyed
and some CSS*Value classes, make their constructors public in MSVC builds.
Added FIXME's to make it look extra gross.
* css/CSSInheritedValue.h:
(WebCore::CSSInheritedValue::create): Deleted.
* css/CSSInitialValue.h:
* css/CSSPrimitiveValue.h:
* css/CSSRevertValue.h:
(WebCore::CSSRevertValue::create): Deleted.
* css/CSSUnsetValue.h:
(WebCore::CSSUnsetValue::create): Deleted.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSInheritedValueh">trunk/Source/WebCore/css/CSSInheritedValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSInitialValueh">trunk/Source/WebCore/css/CSSInitialValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRevertValueh">trunk/Source/WebCore/css/CSSRevertValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSUnsetValueh">trunk/Source/WebCore/css/CSSUnsetValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/ChangeLog 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-01-11 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Fix MSVC build after r194848.
+
+ Since MSVC refuses to recognize the friendship between LazyNeverDestroyed
+ and some CSS*Value classes, make their constructors public in MSVC builds.
+
+ Added FIXME's to make it look extra gross.
+
+ * css/CSSInheritedValue.h:
+ (WebCore::CSSInheritedValue::create): Deleted.
+ * css/CSSInitialValue.h:
+ * css/CSSPrimitiveValue.h:
+ * css/CSSRevertValue.h:
+ (WebCore::CSSRevertValue::create): Deleted.
+ * css/CSSUnsetValue.h:
+ (WebCore::CSSUnsetValue::create): Deleted.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
+2016-01-11 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> CSSValuePool should use nonfragmented storage for eternal caches.
</span><span class="cx"> <https://webkit.org/b/152960>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSInheritedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSInheritedValue.h (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSInheritedValue.h 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/CSSInheritedValue.h 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -28,18 +28,17 @@
</span><span class="cx">
</span><span class="cx"> class CSSInheritedValue : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSInheritedValue> create()
- {
- return adoptRef(*new CSSInheritedValue);
- }
-
</del><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSInheritedValue&) const { return true; }
</span><span class="cx">
</span><ins>+#if COMPILER(MSVC)
+ // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
+public:
+#else
</ins><span class="cx"> private:
</span><span class="cx"> friend class LazyNeverDestroyed<CSSInheritedValue>;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> CSSInheritedValue()
</span><span class="cx"> : CSSValue(InheritedClass)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSInitialValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSInitialValue.h (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSInitialValue.h 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/CSSInitialValue.h 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -43,15 +43,20 @@
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSInitialValue&) const { return true; }
</span><span class="cx">
</span><ins>+#if COMPILER(MSVC)
+ // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
+public:
+#else
</ins><span class="cx"> private:
</span><span class="cx"> friend class LazyNeverDestroyed<CSSInitialValue>;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> CSSInitialValue(bool implicit)
</span><span class="cx"> : CSSValue(InitialClass)
</span><span class="cx"> , m_isImplicit(implicit)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+private:
</ins><span class="cx"> bool m_isImplicit;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -382,9 +382,15 @@
</span><span class="cx"> static double conversionToCanonicalUnitsScaleFactor(unsigned short unitType);
</span><span class="cx">
</span><span class="cx"> static double computeNonCalcLengthDouble(const CSSToLengthConversionData&, unsigned short primitiveType, double value);
</span><ins>+
+#if COMPILER(MSVC)
+ // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
+public:
+#else
</ins><span class="cx"> private:
</span><span class="cx"> friend class CSSValuePool;
</span><span class="cx"> friend class LazyNeverDestroyed<CSSPrimitiveValue>;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> CSSPrimitiveValue(CSSValueID);
</span><span class="cx"> CSSPrimitiveValue(CSSPropertyID);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRevertValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRevertValue.h (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRevertValue.h 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/CSSRevertValue.h 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -33,18 +33,17 @@
</span><span class="cx">
</span><span class="cx"> class CSSRevertValue : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSRevertValue> create()
- {
- return adoptRef(*new CSSRevertValue);
- }
-
</del><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSRevertValue&) const { return true; }
</span><span class="cx">
</span><ins>+#if COMPILER(MSVC)
+ // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
+public:
+#else
</ins><span class="cx"> private:
</span><span class="cx"> friend class LazyNeverDestroyed<CSSRevertValue>;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> CSSRevertValue()
</span><span class="cx"> : CSSValue(RevertClass)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSUnsetValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSUnsetValue.h (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSUnsetValue.h 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/CSSUnsetValue.h 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -33,18 +33,17 @@
</span><span class="cx">
</span><span class="cx"> class CSSUnsetValue : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSUnsetValue> create()
- {
- return adoptRef(*new CSSUnsetValue);
- }
-
</del><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSUnsetValue&) const { return true; }
</span><span class="cx">
</span><ins>+#if COMPILER(MSVC)
+ // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
+public:
+#else
</ins><span class="cx"> private:
</span><span class="cx"> friend class LazyNeverDestroyed<CSSUnsetValue>;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> CSSUnsetValue()
</span><span class="cx"> : CSSValue(UnsetClass)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (194850 => 194851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-01-11 16:21:25 UTC (rev 194850)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-01-11 16:33:30 UTC (rev 194851)
</span><span class="lines">@@ -1880,9 +1880,9 @@
</span><span class="cx"> valueToApply = resolvedVariableValue(id, *downcast<CSSVariableDependentValue>(value));
</span><span class="cx"> if (!valueToApply) {
</span><span class="cx"> if (CSSProperty::isInheritedProperty(id))
</span><del>- valueToApply = CSSInheritedValue::create();
</del><ins>+ valueToApply = CSSValuePool::singleton().createInheritedValue();
</ins><span class="cx"> else
</span><del>- valueToApply = CSSInitialValue::createExplicit();
</del><ins>+ valueToApply = CSSValuePool::singleton().createExplicitInitialValue();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>