[Win] Deactivate WebGL until Windows tests work properly

https://bugs.webkit.org/show_bug.cgi?id=144291
<rdar://problem/20707307>

Reviewed by Zalan Bujtas.

Source/WebKit:

* WebKit.vcxproj/WebKit/WebKitANGLE.props: Added.
* WebKit.vcxproj/WebKit/WebKitCommon.props: Remove ANGLE link
libraries from common property sheet.
* WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Reference
the WebKitANGLE property sheet.
* WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.

Source/WTF:

* wtf/FeatureDefines.h: Force WebGL off for Windows builds.

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.props: Turn off the WEB_GL
feature for the Apple Windows port.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183479 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 8b96fcf83ae8eeb1c4275dda3378404c0df03273..3b8a2f83c035cc4165c6ca465e52f26a142b5ee7 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2015-04-27  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Deactivate WebGL until Windows tests work properly
+        https://bugs.webkit.org/show_bug.cgi?id=144291
+        <rdar://problem/20707307>
+
+        Reviewed by Zalan Bujtas.
+
+        * wtf/FeatureDefines.h: Force WebGL off for Windows builds.
+
 2015-04-27  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Rename WTF_USE_3D_GRAPHICS to ENABLE_GRAPHICS_CONTEXT_3D

diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h
index 7b54c53e78ff416aafca8963692acfe0a0347ddd..3645c77029579200f81dcb9a9d07b4b597032864 100644 (file)
--- a/Source/WTF/wtf/FeatureDefines.h
+++ b/Source/WTF/wtf/FeatureDefines.h
@@ -264,7 +264,7 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
 #if defined(BUILDING_WITH_CMAKE)
 #define ENABLE_WEBGL 0
 #else
-#define ENABLE_WEBGL 1
+#define ENABLE_WEBGL 0
 #endif
 #endif
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8aaadb187fe5069f72057f5d3f7075fa99d1a879..da030e6aa8433f14c63c7fdd1a50ad5de04f333c 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-27  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Deactivate WebGL until Windows tests work properly
+        https://bugs.webkit.org/show_bug.cgi?id=144291
+        <rdar://problem/20707307>
+
+        Reviewed by Zalan Bujtas.
+
+        * WebKit.vcxproj/WebKit/WebKitANGLE.props: Added.
+        * WebKit.vcxproj/WebKit/WebKitCommon.props: Remove ANGLE link
+        libraries from common property sheet.
+        * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Reference
+        the WebKitANGLE property sheet.
+        * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.
+
 2015-04-24  Timothy Hatcher  <timothy@apple.com>
 
         Web Inspector: Remove native window dock controls

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitANGLE.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitANGLE.props
new file mode 100644 (file)
index 0000000..d819789
--- /dev/null
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitANGLE.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+        <AdditionalDependencies>libEGL$(DebugSuffix).lib;libGLESv2$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;translator_common$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props
index 4cf655674009896a384d2b768fd1535ec20eb7fd..259e14e519b15570d9c935b8bbf4b0080466d68b 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props
@@ -13,7 +13,7 @@
       <ForcedIncludeFiles>WebKitPrefix.h;ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libEGL$(DebugSuffix).lib;libGLESv2$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;translator_common$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;opengl32.lib;delayimp.lib;kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;usp10.lib;comctl32.lib;version.lib;shlwapi.lib;libxslt$(DebugSuffix).lib;libxml2$(DebugSuffix).lib;libicuin$(DebugSuffix).lib;libicuuc$(DebugSuffix).lib;WTF$(DebugSuffix).lib;JavaScriptCore$(DebugSuffix).lib;WebCore$(DebugSuffix).lib;WebKitGUID$(DebugSuffix).lib;SQLite3$(DebugSuffix).lib;msimg32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;comsuppw.lib;rpcrt4.lib;zdll$(DebugSuffix).lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>delayimp.lib;kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;usp10.lib;comctl32.lib;version.lib;shlwapi.lib;libxslt$(DebugSuffix).lib;libxml2$(DebugSuffix).lib;libicuin$(DebugSuffix).lib;libicuuc$(DebugSuffix).lib;WTF$(DebugSuffix).lib;JavaScriptCore$(DebugSuffix).lib;WebCore$(DebugSuffix).lib;WebKitGUID$(DebugSuffix).lib;SQLite3$(DebugSuffix).lib;msimg32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;comsuppw.lib;rpcrt4.lib;zdll$(DebugSuffix).lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>usp10.dll;comctl32.dll;version.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
index 0fcb2a74cbdb1dca91e47cfde691a2325623b912..f2fd23a1f6cbd9b9c7d8be4b3cdffc27d635c9c7 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
@@ -7,6 +7,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
+    <Import Project="WebKitANGLE.props" />
     <Import Project="WebKitCommon.props" />
     <Import Project="WebKitDirectX.props" />
     <Import Project="WebKitCFLite.props" />
@@ -14,4 +15,4 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
index 2f1668c7f51d3b30cc24960379c285a3a4a0c39f..a705c384f46109076d5e81e5e51a687edce0ec07 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
@@ -7,6 +7,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
+    <Import Project="WebKitANGLE.props" />
     <Import Project="WebKitCFLite.props" />
     <Import Project="WebKitCommon.props" />
     <Import Project="WebKitDirectX.props" />

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 735e9a4ee8b66f410387c549e5275b8aca1fcdd0..32a6e6076339979069a56fb7ecc350bdbfac08dc 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-27  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Deactivate WebGL until Windows tests work properly
+        https://bugs.webkit.org/show_bug.cgi?id=144291
+        <rdar://problem/20707307>
+
+        Reviewed by Zalan Bujtas.
+
+        * win/tools/vsprops/FeatureDefines.props: Turn off the WEB_GL
+        feature for the Apple Windows port.
+
 2015-04-28  Per Arne Vollan  <peavo@outlook.com>
 
         [Win] Enable ES6 template literals

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
index 26ca1a706506eef2cf0623811e5a8ec95b04f0ea..6624a0f0db1d4b3a05e644cd555b36673431efe2 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
@@ -84,6 +84,7 @@
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
     <ENABLE_WEB_TIMING />
+    <ENABLE_WEBGL />
     <ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
     <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
     <ENABLE_XSLT>ENABLE_XSLT</ENABLE_XSLT>
@@ -93,7 +94,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(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_ES6_TEMPLATE_LITERAL_SYNTAX);$(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_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)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(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_ES6_TEMPLATE_LITERAL_SYNTAX);$(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_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_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -429,6 +430,10 @@
       <Value>$(ENABLE_WEB_TIMING)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
+    <BuildMacro Include="ENABLE_WEBGL">
+      <Value>$(ENABLE_WEBGL)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
     <BuildMacro Include="ENABLE_WEBVTT_REGIONS">
       <Value>$(ENABLE_WEBVTT_REGIONS)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>