X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebKitLibraries%2Fwin%2Ftools%2Fvsprops%2FFeatureDefinesCairo.props;h=1eea7a72733f95fcf554a77bc3b8ec8620b8cd7c;hp=2dcfb8dc479bae1fa4ecb2cf0744896d9284e186;hb=cf1c1a2b2ecfc86ee7b7c521a3fa7275c5b59829;hpb=1ee98b78942a695d1c2e2f1e05909fbbad300d8e;ds=sidebyside

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
index 2dcfb8d..1eea7a7 100644
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <ENABLE_3D_RENDERING />
+    <ENABLE_3D_RENDERING>ENABLE_3D_RENDERING</ENABLE_3D_RENDERING>
     <ENABLE_ACCELERATED_2D_CANVAS />
     <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
     <ENABLE_CANVAS_PATH>ENABLE_CANVAS_PATH</ENABLE_CANVAS_PATH>
@@ -13,12 +13,13 @@
     <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
     <ENABLE_CSS_COMPOSITING />
     <ENABLE_CSS_EXCLUSIONS />
-    <ENABLE_CSS_FILTERS></ENABLE_CSS_FILTERS>
+    <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
     <ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
     <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
     <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
     <ENABLE_CSS_SHADERS />
     <ENABLE_CSS_SHAPES>ENABLE_CSS_SHAPES</ENABLE_CSS_SHAPES>
+    <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>
     <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
     <ENABLE_CUSTOM_SCHEME_HANDLER />
     <ENABLE_DATAGRID />
@@ -35,7 +36,6 @@
     <ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING />
     <ENABLE_HIGH_DPI_CANVAS>ENABLE_HIGH_DPI_CANVAS</ENABLE_HIGH_DPI_CANVAS>
     <ENABLE_ICONDATABASE>ENABLE_ICONDATABASE</ENABLE_ICONDATABASE>
-    <ENABLE_IFRAME_SEAMLESS>ENABLE_IFRAME_SEAMLESS</ENABLE_IFRAME_SEAMLESS>
     <ENABLE_INDEXED_DATABASE />
     <ENABLE_INPUT_SPEECH />
     <ENABLE_INPUT_TYPE_COLOR />
@@ -52,7 +52,7 @@
     <ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
     <ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
     <ENABLE_MEDIA_SOURCE />
-    <ENABLE_MEDIA_STATISTICS />
+    <ENABLE_MEDIA_STATISTICS>ENABLE_MEDIA_STATISTICS</ENABLE_MEDIA_STATISTICS>
     <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
     <ENABLE_MICRODATA />
     <ENABLE_MOUSE_CURSOR_SCALE />
@@ -60,22 +60,23 @@
     <ENABLE_PROXIMITY_EVENTS />
     <ENABLE_QUOTA />
     <ENABLE_NAVIGATOR_CONTENT_UTILS />
+    <ENABLE_PICTURE_SIZES>ENABLE_PICTURE_SIZES</ENABLE_PICTURE_SIZES>
     <ENABLE_PROMISES>ENABLE_PROMISES</ENABLE_PROMISES>
-    <ENABLE_REQUEST_ANIMATION_FRAME />
+    <ENABLE_REQUEST_ANIMATION_FRAME>ENABLE_REQUEST_ANIMATION_FRAME</ENABLE_REQUEST_ANIMATION_FRAME>
     <ENABLE_SCRIPTED_SPEECH />
     <ENABLE_SHADOW_DOM />
     <ENABLE_SHARED_WORKERS>ENABLE_SHARED_WORKERS</ENABLE_SHARED_WORKERS>
     <ENABLE_SQL_DATABASE>ENABLE_SQL_DATABASE</ENABLE_SQL_DATABASE>
     <ENABLE_STYLE_SCOPED />
-    <ENABLE_SUBPIXEL_LAYOUT></ENABLE_SUBPIXEL_LAYOUT>
+    <ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
     <ENABLE_SVG>ENABLE_SVG</ENABLE_SVG>
     <ENABLE_SVG_DOM_OBJC_BINDINGS />
     <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
-    <ENABLE_TEMPLATE_ELEMENT />
+    <ENABLE_TEMPLATE_ELEMENT>ENABLE_TEMPLATE_ELEMENT</ENABLE_TEMPLATE_ELEMENT>
     <ENABLE_TEXT_AUTOSIZING />
     <ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
     <ENABLE_VIDEO_TRACK>ENABLE_VIDEO_TRACK</ENABLE_VIDEO_TRACK>
-    <ENABLE_VIEW_MODE_CSS_MEDIA />
+    <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
     <ENABLE_WEB_TIMING />
@@ -87,7 +88,7 @@
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
-    <ClCompile> 
+    <ClCompile>
 <PreprocessorDefinitions>$(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_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(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_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(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_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_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)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -164,6 +165,10 @@
       <Value>$(ENABLE_CSS_SHAPES)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_SHAPE_INSIDE">
+      <Value>$(ENABLE_CSS_SHAPE_INSIDE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
     <BuildMacro Include="ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED">
       <Value>$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
@@ -228,10 +233,6 @@
       <Value>$(ENABLE_ICONDATABASE)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_IFRAME_SEAMLESS">
-      <Value>$(ENABLE_IFRAME_SEAMLESS)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_INDEXED_DATABASE">
       <Value>$(ENABLE_INDEXED_DATABASE)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>