<!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>[180990] trunk</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/180990">180990</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 21:29:12 -0800 (Tue, 03 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win] [Attachment] New Tests fail on Windows
https://bugs.webkit.org/show_bug.cgi?id=142017

WebKitLibraries:

Unreviewed test fix. Just activate the feature.

* win/tools/vsprops/FeatureDefines.props:
* win/tools/vsprops/FeatureDefinesCairo.props:

LayoutTests:

Unreviewed. Rebaseline tests for Windows display metrics.

* platform/win/fast/attachment/attachment-disabled-rendering-expected.txt:
* platform/win/fast/attachment/attachment-rendering-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinfastattachmentattachmentdisabledrenderingexpectedtxt">trunk/LayoutTests/platform/win/fast/attachment/attachment-disabled-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinfastattachmentattachmentrenderingexpectedtxt">trunk/LayoutTests/platform/win/fast/attachment/attachment-rendering-expected.txt</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/LayoutTests/ChangeLog        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        [Win] [Attachment] New Tests fail on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=142017
+
+        Unreviewed. Rebaseline tests for Windows display metrics.
+
+        * platform/win/fast/attachment/attachment-disabled-rendering-expected.txt:
+        * platform/win/fast/attachment/attachment-rendering-expected.txt:
+
</ins><span class="cx"> 2015-03-03  Stephanie Lewis  &lt;slewis@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update TestExpectations after http://trac.webkit.org/changeset/180965 to skip new test on Mavericks.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinfastattachmentattachmentdisabledrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/fast/attachment/attachment-disabled-rendering-expected.txt (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/attachment/attachment-disabled-rendering-expected.txt        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/LayoutTests/platform/win/fast/attachment/attachment-disabled-rendering-expected.txt        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -2,10 +2,10 @@
</span><span class="cx">   RenderView at (0,0) size 800x600
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx">   RenderBlock {HTML} at (0,0) size 800x600
</span><del>-    RenderBody {BODY} at (8,8) size 784x576
</del><ins>+    RenderBody {BODY} at (8,8) size 784x584
</ins><span class="cx">       RenderBlock {P} at (0,0) size 784x18
</span><del>-        RenderText {#text} at (0,0) size 750x18
-          text run at (0,0) width 750: &quot;This tests that attachments don't have a custom renderer when they are disabled. This test must be run in the test runner.&quot;
</del><ins>+        RenderText {#text} at (0,0) size 766x18
+          text run at (0,0) width 766: &quot;This tests that attachments don't have a custom renderer when they are disabled. This test must be run in the test runner.&quot;
</ins><span class="cx">       RenderBlock (anonymous) at (0,34) size 784x0
</span><del>-        RenderInline {ATTACHMENT} at (0,0) size 0x0
</del><ins>+        RenderBlock {ATTACHMENT} at (0,0) size 0x0
</ins><span class="cx">         RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinfastattachmentattachmentrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/fast/attachment/attachment-rendering-expected.txt (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/attachment/attachment-rendering-expected.txt        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/LayoutTests/platform/win/fast/attachment/attachment-rendering-expected.txt        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -2,10 +2,10 @@
</span><span class="cx">   RenderView at (0,0) size 800x600
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx">   RenderBlock {HTML} at (0,0) size 800x600
</span><del>-    RenderBody {BODY} at (8,8) size 784x576
</del><ins>+    RenderBody {BODY} at (8,8) size 784x584
</ins><span class="cx">       RenderBlock {P} at (0,0) size 784x18
</span><del>-        RenderText {#text} at (0,0) size 318x18
-          text run at (0,0) width 318: &quot;This tests that attachments have a custom renderer.&quot;
-      RenderBlock (anonymous) at (0,34) size 784x0
-        RenderInline {ATTACHMENT} at (0,0) size 0x0
</del><ins>+        RenderText {#text} at (0,0) size 326x18
+          text run at (0,0) width 326: &quot;This tests that attachments have a custom renderer.&quot;
+      RenderBlock (anonymous) at (0,34) size 784x60
+        RenderAttachment {ATTACHMENT} at (0,0) size 60x60
</ins><span class="cx">         RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/WebKitLibraries/ChangeLog        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        [Win] [Attachment] New Tests fail on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=142017
+
+        Unreviewed test fix. Just activate the feature.
+
+        * win/tools/vsprops/FeatureDefines.props:
+        * win/tools/vsprops/FeatureDefinesCairo.props:
+
</ins><span class="cx"> 2015-02-26  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Unreviewed build fix after r180676.
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx">     &lt;ENABLE_3D_RENDERING&gt;ENABLE_3D_RENDERING&lt;/ENABLE_3D_RENDERING&gt;
</span><span class="cx">     &lt;ENABLE_ACCELERATED_2D_CANVAS /&gt;
</span><span class="cx">     &lt;ENABLE_ACCELERATED_OVERFLOW_SCROLLING /&gt;
</span><ins>+    &lt;ENABLE_ATTACHMENT_ELEMENT&gt;ENABLE_ATTACHMENT_ELEMENT&lt;/ENABLE_ATTACHMENT_ELEMENT&gt;
</ins><span class="cx">     &lt;ENABLE_CANVAS_PATH&gt;ENABLE_CANVAS_PATH&lt;/ENABLE_CANVAS_PATH&gt;
</span><span class="cx">     &lt;ENABLE_CANVAS_PROXY /&gt;
</span><span class="cx">     &lt;ENABLE_CHANNEL_MESSAGING&gt;ENABLE_CHANNEL_MESSAGING&lt;/ENABLE_CHANNEL_MESSAGING&gt;
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx">   &lt;/PropertyGroup&gt;
</span><span class="cx">   &lt;ItemDefinitionGroup&gt;
</span><span class="cx">     &lt;ClCompile&gt;
</span><del>-      &lt;PreprocessorDefinitions&gt;$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABL
 E_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);
 $(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)&lt;/PreprocessorDefinitions&gt;
</del><ins>+      &lt;PreprocessorDefinitions&gt;$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_AP
 I);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BI
 NDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)&lt;/PreprocessorDefinitions&gt;
</ins><span class="cx">     &lt;/ClCompile&gt;
</span><span class="cx">   &lt;/ItemDefinitionGroup&gt;
</span><span class="cx">   &lt;ItemGroup&gt;
</span><span class="lines">@@ -107,6 +108,10 @@
</span><span class="cx">       &lt;Value&gt;$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="cx">     &lt;/BuildMacro&gt;
</span><ins>+    &lt;BuildMacro Include=&quot;ENABLE_ATTACHMENT_ELEMENT&quot;&gt;
+      &lt;Value&gt;$(ENABLE_ATTACHMENT_ELEMENT)&lt;/Value&gt;
+      &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
+    &lt;/BuildMacro&gt;
</ins><span class="cx">     &lt;BuildMacro Include=&quot;ENABLE_CANVAS_PATH&quot;&gt;
</span><span class="cx">       &lt;Value&gt;$(ENABLE_CANVAS_PATH)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props (180989 => 180990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props        2015-03-04 05:26:54 UTC (rev 180989)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props        2015-03-04 05:29:12 UTC (rev 180990)
</span><span class="lines">@@ -4,11 +4,12 @@
</span><span class="cx">     &lt;ENABLE_3D_RENDERING&gt;ENABLE_3D_RENDERING&lt;/ENABLE_3D_RENDERING&gt;
</span><span class="cx">     &lt;ENABLE_ACCELERATED_2D_CANVAS /&gt;
</span><span class="cx">     &lt;ENABLE_ACCELERATED_OVERFLOW_SCROLLING /&gt;
</span><ins>+    &lt;ENABLE_ATTACHMENT_ELEMENT&gt;ENABLE_ATTACHMENT_ELEMENT&lt;/ENABLE_ATTACHMENT_ELEMENT&gt;
</ins><span class="cx">     &lt;ENABLE_CANVAS_PATH&gt;ENABLE_CANVAS_PATH&lt;/ENABLE_CANVAS_PATH&gt;
</span><span class="cx">     &lt;ENABLE_CANVAS_PROXY /&gt;
</span><span class="cx">     &lt;ENABLE_CHANNEL_MESSAGING&gt;ENABLE_CHANNEL_MESSAGING&lt;/ENABLE_CHANNEL_MESSAGING&gt;
</span><span class="cx">     &lt;ENABLE_CSP_NEXT /&gt;
</span><del>-    &lt;ENABLE_CSS3_CONDITIONAL_RULES /&gt;
</del><ins>+    &lt;ENABLE_CSS3_CONDITIONAL_RULES&gt;ENABLE_CSS3_CONDITIONAL_RULES&lt;/ENABLE_CSS3_CONDITIONAL_RULES&gt;
</ins><span class="cx">     &lt;ENABLE_CSS3_TEXT /&gt;
</span><span class="cx">     &lt;ENABLE_CSS_BOX_DECORATION_BREAK&gt;ENABLE_CSS_BOX_DECORATION_BREAK&lt;/ENABLE_CSS_BOX_DECORATION_BREAK&gt;
</span><span class="cx">     &lt;ENABLE_CSS_COMPOSITING /&gt;
</span><span class="lines">@@ -20,6 +21,7 @@
</span><span class="cx">     &lt;ENABLE_CSS_SHAPES&gt;ENABLE_CSS_SHAPES&lt;/ENABLE_CSS_SHAPES&gt;
</span><span class="cx">     &lt;ENABLE_CSS_SHAPE_INSIDE&gt;ENABLE_CSS_SHAPE_INSIDE&lt;/ENABLE_CSS_SHAPE_INSIDE&gt;
</span><span class="cx">     &lt;ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED&gt;ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED&lt;/ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED&gt;
</span><ins>+    &lt;ENABLE_CURSOR_VISIBILITY&gt;ENABLE_CURSOR_VISIBILITY&lt;/ENABLE_CURSOR_VISIBILITY&gt;
</ins><span class="cx">     &lt;ENABLE_CUSTOM_SCHEME_HANDLER /&gt;
</span><span class="cx">     &lt;ENABLE_DATAGRID /&gt;
</span><span class="cx">     &lt;ENABLE_DATALIST_ELEMENT /&gt;
</span><span class="lines">@@ -27,6 +29,8 @@
</span><span class="cx">     &lt;ENABLE_DETAILS_ELEMENT&gt;ENABLE_DETAILS_ELEMENT&lt;/ENABLE_DETAILS_ELEMENT&gt;
</span><span class="cx">     &lt;ENABLE_DEVICE_ORIENTATION /&gt;
</span><span class="cx">     &lt;ENABLE_DIRECTORY_UPLOAD /&gt;
</span><ins>+    &lt;ENABLE_DOM4_EVENTS_CONSTRUCTOR&gt;ENABLE_DOM4_EVENTS_CONSTRUCTOR&lt;/ENABLE_DOM4_EVENTS_CONSTRUCTOR&gt;
+    &lt;ENABLE_ENCRYPTED_MEDIA_V2 /&gt;
</ins><span class="cx">     &lt;ENABLE_FILE_SYSTEM /&gt;
</span><span class="cx">     &lt;ENABLE_FULLSCREEN_API&gt;ENABLE_FULLSCREEN_API&lt;/ENABLE_FULLSCREEN_API&gt;
</span><span class="cx">     &lt;ENABLE_GAMEPAD /&gt;
</span><span class="lines">@@ -88,7 +92,7 @@
</span><span class="cx">   &lt;/PropertyGroup&gt;
</span><span class="cx">   &lt;ItemDefinitionGroup&gt;
</span><span class="cx">     &lt;ClCompile&gt;
</span><del>-      &lt;PreprocessorDefinitions&gt;$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABL
 E_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_V
 IDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)&lt;/PreprocessorDefinitions&gt;
</del><ins>+      &lt;PreprocessorDefinitions&gt;$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_AP
 I);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BI
 NDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)&lt;/PreprocessorDefinitions&gt;
</ins><span class="cx">     &lt;/ClCompile&gt;
</span><span class="cx">   &lt;/ItemDefinitionGroup&gt;
</span><span class="cx">   &lt;ItemGroup&gt;
</span><span class="lines">@@ -104,6 +108,10 @@
</span><span class="cx">       &lt;Value&gt;$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="cx">     &lt;/BuildMacro&gt;
</span><ins>+    &lt;BuildMacro Include=&quot;ENABLE_ATTACHMENT_ELEMENT&quot;&gt;
+      &lt;Value&gt;$(ENABLE_ATTACHMENT_ELEMENT)&lt;/Value&gt;
+      &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
+    &lt;/BuildMacro&gt;
</ins><span class="cx">     &lt;BuildMacro Include=&quot;ENABLE_CANVAS_PATH&quot;&gt;
</span><span class="cx">       &lt;Value&gt;$(ENABLE_CANVAS_PATH)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="lines">@@ -168,6 +176,10 @@
</span><span class="cx">       &lt;Value&gt;$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="cx">     &lt;/BuildMacro&gt;
</span><ins>+    &lt;BuildMacro Include=&quot;ENABLE_CURSOR_VISIBILITY&quot;&gt;
+      &lt;Value&gt;$(ENABLE_CURSOR_VISIBILITY)&lt;/Value&gt;
+      &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
+    &lt;/BuildMacro&gt;
</ins><span class="cx">     &lt;BuildMacro Include=&quot;ENABLE_CUSTOM_SCHEME_HANDLER&quot;&gt;
</span><span class="cx">       &lt;Value&gt;$(ENABLE_CUSTOM_SCHEME_HANDLER)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="lines">@@ -196,6 +208,14 @@
</span><span class="cx">       &lt;Value&gt;$(ENABLE_DIRECTORY_UPLOAD)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span><span class="cx">     &lt;/BuildMacro&gt;
</span><ins>+    &lt;BuildMacro Include=&quot;ENABLE_DOM4_EVENTS_CONSTRUCTOR&quot;&gt;
+      &lt;Value&gt;$(ENABLE_DOM4_EVENTS_CONSTRUCTOR)&lt;/Value&gt;
+      &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
+    &lt;/BuildMacro&gt;
+    &lt;BuildMacro Include=&quot;ENABLE_ENCRYPTED_MEDIA_V2&quot;&gt;
+      &lt;Value&gt;$(ENABLE_ENCRYPTED_MEDIA_V2)&lt;/Value&gt;
+      &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
+    &lt;/BuildMacro&gt;
</ins><span class="cx">     &lt;BuildMacro Include=&quot;ENABLE_FILE_SYSTEM&quot;&gt;
</span><span class="cx">       &lt;Value&gt;$(ENABLE_FILE_SYSTEM)&lt;/Value&gt;
</span><span class="cx">       &lt;EnvironmentVariable&gt;true&lt;/EnvironmentVariable&gt;
</span></span></pre>
</div>
</div>

</body>
</html>