<!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>[51901] trunk/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/51901">51901</a></dd>
<dt>Author</dt> <dd>senorblanco@chromium.org</dd>
<dt>Date</dt> <dd>2009-12-09 09:28:21 -0800 (Wed, 09 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enable SVG filters in Chromium build.
https://bugs.webkit.org/show_bug.cgi?id=32323

Reviewed by Darin Fisher.

Covered by SVG filter layout tests.

* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* bindings/scripts/CodeGeneratorV8.pm:
* bindings/v8/DerivedSourcesAllInOne.cpp:
* bindings/v8/V8DOMWrapper.cpp:
* bindings/v8/V8Index.cpp:
* bindings/v8/V8Index.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCoregypWebCoregyp">trunk/WebCore/WebCore.gyp/WebCore.gyp</a></li>
<li><a href="#trunkWebCoreWebCoregypi">trunk/WebCore/WebCore.gypi</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorV8pm">trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm</a></li>
<li><a href="#trunkWebCorebindingsv8DerivedSourcesAllInOnecpp">trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8DOMWrappercpp">trunk/WebCore/bindings/v8/V8DOMWrapper.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8Indexcpp">trunk/WebCore/bindings/v8/V8Index.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8Indexh">trunk/WebCore/bindings/v8/V8Index.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/ChangeLog        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2009-12-09  Stephen White  &lt;senorblanco@chromium.org&gt;
+
+        Reviewed by Darin Fisher.
+
+        Enable SVG filters in Chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=32323
+
+        Covered by SVG filter layout tests.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/DerivedSourcesAllInOne.cpp:
+        * bindings/v8/V8DOMWrapper.cpp:
+        * bindings/v8/V8Index.cpp:
+        * bindings/v8/V8Index.h:
+
</ins><span class="cx"> 2009-12-09  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Build fix
</span></span></pre></div>
<a id="trunkWebCoreWebCoregypWebCoregyp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.gyp/WebCore.gyp (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.gyp/WebCore.gyp        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/WebCore.gyp/WebCore.gyp        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx">       '../platform/chromium',
</span><span class="cx">       '../platform/graphics',
</span><span class="cx">       '../platform/graphics/chromium',
</span><ins>+      '../platform/graphics/filters',
</ins><span class="cx">       '../platform/graphics/opentype',
</span><span class="cx">       '../platform/graphics/skia',
</span><span class="cx">       '../platform/graphics/transforms',
</span><span class="lines">@@ -156,6 +157,7 @@
</span><span class="cx">       '../svg',
</span><span class="cx">       '../svg/animation',
</span><span class="cx">       '../svg/graphics',
</span><ins>+      '../svg/graphics/filters',
</ins><span class="cx">       '../websockets',
</span><span class="cx">       '../workers',
</span><span class="cx">       '../xml',
</span><span class="lines">@@ -214,11 +216,6 @@
</span><span class="cx">         # idl rule
</span><span class="cx">         '&lt;@(webcore_bindings_idl_files)',
</span><span class="cx">       ],
</span><del>-      'sources/': [
-        # SVG_FILTERS only.
-        ['exclude', 'svg/SVG(FE|Filter)[^/]*\\.idl$'],
-
-      ],
</del><span class="cx">       'sources!': [
</span><span class="cx">         # Custom bindings in bindings/v8/custom exist for these.
</span><span class="cx">         '../dom/EventListener.idl',
</span><span class="lines">@@ -235,7 +232,6 @@
</span><span class="cx">         # Extra SVG bindings to exclude.
</span><span class="cx">         '../svg/ElementTimeControl.idl',
</span><span class="cx">         '../svg/SVGAnimatedPathData.idl',
</span><del>-        '../svg/SVGComponentTransferFunctionElement.idl',
</del><span class="cx">         '../svg/SVGExternalResourcesRequired.idl',
</span><span class="cx">         '../svg/SVGFitToViewBox.idl',
</span><span class="cx">         '../svg/SVGHKernElement.idl',
</span><span class="lines">@@ -661,11 +657,6 @@
</span><span class="cx">         ['include', 'loader/appcache/ApplicationCacheHost\.h$'],
</span><span class="cx">         ['include', 'loader/appcache/DOMApplicationCache\.(h|cpp)$'],
</span><span class="cx"> 
</span><del>-        # SVG_FILTERS only.
-        ['exclude', '(platform|svg)/graphics/filters/'],
-        ['exclude', 'svg/Filter[^/]*\\.cpp$'],
-        ['exclude', 'svg/SVG(FE|Filter)[^/]*\\.cpp$'],
-
</del><span class="cx">         # Exclude some DB-related files.
</span><span class="cx">         ['exclude', 'platform/sql/SQLiteFileSystem.cpp'],
</span><span class="cx">         ['exclude', 'storage/DatabaseTracker.cpp'],
</span></span></pre></div>
<a id="trunkWebCoreWebCoregypi"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.gypi (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.gypi        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/WebCore.gypi        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -1975,6 +1975,11 @@
</span><span class="cx">             'platform/graphics/filters/FEComposite.h',
</span><span class="cx">             'platform/graphics/filters/FEGaussianBlur.cpp',
</span><span class="cx">             'platform/graphics/filters/FEGaussianBlur.h',
</span><ins>+            'platform/graphics/filters/Filter.h',
+            'platform/graphics/filters/FilterEffect.cpp',
+            'platform/graphics/filters/FilterEffect.h',
+            'platform/graphics/filters/ImageBufferFilter.cpp',
+            'platform/graphics/filters/ImageBufferFilter.h',
</ins><span class="cx">             'platform/graphics/filters/SourceAlpha.cpp',
</span><span class="cx">             'platform/graphics/filters/SourceAlpha.h',
</span><span class="cx">             'platform/graphics/filters/SourceGraphic.cpp',
</span><span class="lines">@@ -3219,8 +3224,10 @@
</span><span class="cx">             'svg/graphics/filters/SVGFETile.h',
</span><span class="cx">             'svg/graphics/filters/SVGFETurbulence.cpp',
</span><span class="cx">             'svg/graphics/filters/SVGFETurbulence.h',
</span><del>-            'svg/graphics/filters/SVGFilterEffect.cpp',
-            'svg/graphics/filters/SVGFilterEffect.h',
</del><ins>+            'svg/graphics/filters/SVGFilter.cpp',
+            'svg/graphics/filters/SVGFilter.h',
+            'svg/graphics/filters/SVGFilterBuilder.cpp',
+            'svg/graphics/filters/SVGFilterBuilder.h',
</ins><span class="cx">             'svg/graphics/filters/SVGLightSource.cpp',
</span><span class="cx">             'svg/graphics/filters/SVGLightSource.h',
</span><span class="cx">             'svg/graphics/filters/SVGPointLightSource.h',
</span><span class="lines">@@ -3253,12 +3260,6 @@
</span><span class="cx">             'svg/ColorDistance.cpp',
</span><span class="cx">             'svg/ColorDistance.h',
</span><span class="cx">             'svg/ElementTimeControl.h',
</span><del>-            'svg/Filter.cpp',
-            'svg/Filter.h',
-            'svg/FilterBuilder.h',
-            'svg/FilterBuilder.cpp',
-            'svg/FilterEffect.cpp',
-            'svg/FilterEffect.h',
</del><span class="cx">             'svg/GradientAttributes.h',
</span><span class="cx">             'svg/LinearGradientAttributes.h',
</span><span class="cx">             'svg/PatternAttributes.h',
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorV8pm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -564,8 +564,13 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     my $getterFunc = $codeGenerator-&gt;WK_lcfirst($attrName);
</span><del>-    $getterFunc .= &quot;Animated&quot; if $codeGenerator-&gt;IsSVGAnimatedType($attribute-&gt;signature-&gt;type);
</del><span class="cx"> 
</span><ins>+    if ($codeGenerator-&gt;IsSVGAnimatedType($attribute-&gt;signature-&gt;type)) {
+        # Some SVGFE*Element.idl use 'operator' as attribute name; rewrite as '_operator' to avoid clashes with C/C++
+        $getterFunc = &quot;_&quot; . $getterFunc if ($attrName =~ /operator/);
+        $getterFunc .= &quot;Animated&quot;;
+    }
+
</ins><span class="cx">     my $returnType = GetTypeFromSignature($attribute-&gt;signature);
</span><span class="cx"> 
</span><span class="cx">     my $getterString;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8DerivedSourcesAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -292,6 +292,7 @@
</span><span class="cx"> #include &quot;bindings/V8SVGCircleElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGClipPathElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGColor.cpp&quot;
</span><ins>+#include &quot;bindings/V8SVGComponentTransferFunctionElement.cpp&quot;
</ins><span class="cx"> #include &quot;bindings/V8SVGCursorElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGDefsElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGDescElement.cpp&quot;
</span><span class="lines">@@ -301,6 +302,30 @@
</span><span class="cx"> #include &quot;bindings/V8SVGElementInstanceList.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGEllipseElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGException.cpp&quot;
</span><ins>+#include &quot;bindings/V8SVGFEBlendElement.cpp&quot;
+#include &quot;bindings/V8SVGFEColorMatrixElement.cpp&quot;
+#include &quot;bindings/V8SVGFEComponentTransferElement.cpp&quot;
+#include &quot;bindings/V8SVGFECompositeElement.cpp&quot;
+#include &quot;bindings/V8SVGFEDiffuseLightingElement.cpp&quot;
+#include &quot;bindings/V8SVGFEDisplacementMapElement.cpp&quot;
+#include &quot;bindings/V8SVGFEDistantLightElement.cpp&quot;
+#include &quot;bindings/V8SVGFEFloodElement.cpp&quot;
+#include &quot;bindings/V8SVGFEFuncAElement.cpp&quot;
+#include &quot;bindings/V8SVGFEFuncBElement.cpp&quot;
+#include &quot;bindings/V8SVGFEFuncGElement.cpp&quot;
+#include &quot;bindings/V8SVGFEFuncRElement.cpp&quot;
+#include &quot;bindings/V8SVGFEGaussianBlurElement.cpp&quot;
+#include &quot;bindings/V8SVGFEImageElement.cpp&quot;
+#include &quot;bindings/V8SVGFEMergeElement.cpp&quot;
+#include &quot;bindings/V8SVGFEMergeNodeElement.cpp&quot;
+#include &quot;bindings/V8SVGFEMorphologyElement.cpp&quot;
+#include &quot;bindings/V8SVGFEOffsetElement.cpp&quot;
+#include &quot;bindings/V8SVGFEPointLightElement.cpp&quot;
+#include &quot;bindings/V8SVGFESpecularLightingElement.cpp&quot;
+#include &quot;bindings/V8SVGFESpotLightElement.cpp&quot;
+#include &quot;bindings/V8SVGFETileElement.cpp&quot;
+#include &quot;bindings/V8SVGFETurbulenceElement.cpp&quot;
+#include &quot;bindings/V8SVGFilterElement.cpp&quot;
</ins><span class="cx"> #include &quot;bindings/V8SVGFontElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGFontFaceElement.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8SVGFontFaceFormatElement.cpp&quot;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8DOMWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8DOMWrapper.cpp (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8DOMWrapper.cpp        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/bindings/v8/V8DOMWrapper.cpp        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -1105,7 +1105,7 @@
</span><span class="cx"> #define FOR_EACH_ANIMATION_TAG(macro)
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(SVG_FILTERS)
</del><ins>+#if ENABLE(SVG) &amp;&amp; ENABLE(FILTERS)
</ins><span class="cx"> #define FOR_EACH_FILTERS_TAG(macro) \
</span><span class="cx">     macro(feBlend, FEBLEND) \
</span><span class="cx">     macro(feColorMatrix, FECOLORMATRIX) \
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Indexcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Index.cpp (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Index.cpp        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/bindings/v8/V8Index.cpp        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> #include &quot;V8SVGSetElement.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(SVG_FILTERS)
</del><ins>+#if ENABLE(SVG) &amp;&amp; ENABLE(FILTERS)
</ins><span class="cx"> #include &quot;V8SVGComponentTransferFunctionElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFEBlendElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFEColorMatrixElement.h&quot;
</span><span class="lines">@@ -238,6 +238,7 @@
</span><span class="cx"> #include &quot;V8SVGFEImageElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFEMergeElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFEMergeNodeElement.h&quot;
</span><ins>+#include &quot;V8SVGFEMorphologyElement.h&quot;
</ins><span class="cx"> #include &quot;V8SVGFEOffsetElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFEPointLightElement.h&quot;
</span><span class="cx"> #include &quot;V8SVGFESpecularLightingElement.h&quot;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Indexh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Index.h (51900 => 51901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Index.h        2009-12-09 15:26:49 UTC (rev 51900)
+++ trunk/WebCore/bindings/v8/V8Index.h        2009-12-09 17:28:21 UTC (rev 51901)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> #define SVG_ANIMATION_ELEMENT_TYPES(V)
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(SVG_FILTERS)
</del><ins>+#if ENABLE(SVG) &amp;&amp; ENABLE(FILTERS)
</ins><span class="cx"> #define SVG_FILTERS_ELEMENT_TYPES(V)                                    \
</span><span class="cx">     V(SVGCOMPONENTTRANSFERFUNCTIONELEMENT, SVGComponentTransferFunctionElement)\
</span><span class="cx">     V(SVGFEBLENDELEMENT, SVGFEBlendElement)                             \
</span><span class="lines">@@ -216,6 +216,7 @@
</span><span class="cx">     V(SVGFEIMAGEELEMENT, SVGFEImageElement)                             \
</span><span class="cx">     V(SVGFEMERGEELEMENT, SVGFEMergeElement)                             \
</span><span class="cx">     V(SVGFEMERGENODEELEMENT, SVGFEMergeNodeElement)                     \
</span><ins>+    V(SVGFEMORPHOLOGYELEMENT, SVGFEMorphologyElement)                   \
</ins><span class="cx">     V(SVGFEOFFSETELEMENT, SVGFEOffsetElement)                           \
</span><span class="cx">     V(SVGFEPOINTLIGHTELEMENT, SVGFEPointLightElement)                   \
</span><span class="cx">     V(SVGFESPECULARLIGHTINGELEMENT, SVGFESpecularLightingElement)       \
</span></span></pre>
</div>
</div>

</body>
</html>