<!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>[177953] 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/177953">177953</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 02:25:16 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move '-webkit-filter' / '-webkit-backdrop-filter' to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=140111
Reviewed by Darin Adler.
Move '-webkit-filter' / '-webkit-backdrop-filter' to the new
StyleBuilder.
* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::createFilterOperations):
* css/CSSPropertyNames.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertFilterOperations):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::createFilterOperations):
* css/StyleResolver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-06 Chris Dumez <cdumez@apple.com>
+
+ Move '-webkit-filter' / '-webkit-backdrop-filter' to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=140111
+
+ Reviewed by Darin Adler.
+
+ Move '-webkit-filter' / '-webkit-backdrop-filter' to the new
+ StyleBuilder.
+
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::createFilterOperations):
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertFilterOperations):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::createFilterOperations):
+ * css/StyleResolver.h:
+
</ins><span class="cx"> 2015-01-05 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Modernize and streamline HTMLToken and AtomicHTMLToken
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -139,7 +139,8 @@
</span><span class="cx"> void CSSFilterImageValue::createFilterOperations(StyleResolver* resolver)
</span><span class="cx"> {
</span><span class="cx"> m_filterOperations.clear();
</span><del>- resolver->createFilterOperations(m_filterValue.get(), m_filterOperations);
</del><ins>+ if (m_filterValue)
+ resolver->createFilterOperations(*m_filterValue, m_filterOperations);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSFilterImageValue::FilterSubimageObserverProxy::imageChanged(CachedImage*, const IntRect* rect)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> mix-blend-mode [TypeName=BlendMode, NameForMethods=BlendMode]
</span><span class="cx"> isolation [TypeName=Isolation]
</span><span class="cx"> #endif
</span><del>--webkit-filter [LegacyStyleBuilder]
</del><ins>+-webkit-filter [ConditionalConverter=FilterOperations, TypeName=FilterOperations]
</ins><span class="cx"> align-content
</span><span class="cx"> -webkit-align-content = align-content
</span><span class="cx"> align-items
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> justify-content
</span><span class="cx"> -webkit-justify-content = justify-content
</span><span class="cx"> #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
</span><del>--webkit-backdrop-filter [LegacyStyleBuilder]
</del><ins>+-webkit-backdrop-filter [ConditionalConverter=FilterOperations, TypeName=FilterOperations]
</ins><span class="cx"> #endif
</span><span class="cx"> -webkit-justify-self [Custom=Value]
</span><span class="cx"> -webkit-font-size-delta [LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> static bool convertWordSpacing(StyleResolver&, CSSValue&, Length&);
</span><span class="cx"> static bool convertPerspective(StyleResolver&, CSSValue&, float&);
</span><span class="cx"> static bool convertMarqueeIncrement(StyleResolver&, CSSValue&, Length&);
</span><ins>+ static bool convertFilterOperations(StyleResolver&, CSSValue&, FilterOperations&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class StyleBuilderCustom;
</span><span class="lines">@@ -924,6 +925,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool StyleBuilderConverter::convertFilterOperations(StyleResolver& styleResolver, CSSValue& value, FilterOperations& operations)
+{
+ return styleResolver.createFilterOperations(value, operations);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -2405,24 +2405,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case CSSPropertyWebkitFilter: {
- HANDLE_INHERIT_AND_INITIAL(filter, Filter);
- FilterOperations operations;
- if (createFilterOperations(value, operations))
- state.style()->setFilter(operations);
- return;
- }
-
-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter: {
- HANDLE_INHERIT_AND_INITIAL(backdropFilter, BackdropFilter);
- FilterOperations operations;
- if (createFilterOperations(value, operations))
- state.style()->setBackdropFilter(operations);
- return;
- }
-#endif
-
</del><span class="cx"> case CSSPropertyWebkitMaskImage: {
</span><span class="cx"> Vector<RefPtr<MaskImageOperation>> operations;
</span><span class="cx"> if (createMaskImageOperations(value, operations))
</span><span class="lines">@@ -2761,6 +2743,10 @@
</span><span class="cx"> case CSSPropertyWebkitGridTemplateAreas:
</span><span class="cx"> case CSSPropertyWebkitGridAutoFlow:
</span><span class="cx"> #endif // ENABLE(CSS_GRID_LAYOUT)
</span><ins>+ case CSSPropertyWebkitFilter:
+#if ENABLE(FILTERS_LEVEL_2)
+ case CSSPropertyWebkitBackdropFilter:
+#endif
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="lines">@@ -3068,25 +3054,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations& outOperations)
</del><ins>+bool StyleResolver::createFilterOperations(CSSValue& inValue, FilterOperations& outOperations)
</ins><span class="cx"> {
</span><span class="cx"> State& state = m_state;
</span><span class="cx"> ASSERT(outOperations.isEmpty());
</span><span class="cx">
</span><del>- if (!inValue)
- return false;
-
- if (is<CSSPrimitiveValue>(*inValue)) {
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*inValue);
</del><ins>+ if (is<CSSPrimitiveValue>(inValue)) {
+ CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(inValue);
</ins><span class="cx"> if (primitiveValue.getValueID() == CSSValueNone)
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!is<CSSValueList>(*inValue))
</del><ins>+ if (!is<CSSValueList>(inValue))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> FilterOperations operations;
</span><del>- for (auto& currentValue : downcast<CSSValueList>(*inValue)) {
</del><ins>+ for (auto& currentValue : downcast<CSSValueList>(inValue)) {
</ins><span class="cx"> if (!is<WebKitCSSFilterValue>(currentValue.get()))
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (177952 => 177953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2015-01-06 08:06:09 UTC (rev 177952)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-01-06 10:25:16 UTC (rev 177953)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> void clearCachedPropertiesAffectedByViewportUnits();
</span><span class="cx">
</span><del>- bool createFilterOperations(CSSValue* inValue, FilterOperations& outOperations);
</del><ins>+ bool createFilterOperations(CSSValue& inValue, FilterOperations& outOperations);
</ins><span class="cx"> bool createMaskImageOperations(CSSValue* inValue, Vector<RefPtr<MaskImageOperation>>& outOperations);
</span><span class="cx"> void loadPendingSVGDocuments();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>