Skip to site navigation (Press enter)

[webkit-changes] [172676] tags/Safari-600.1.10.1

matthew_hanson Fri, 15 Aug 2014 19:24:07 -0700

Title: [172676] tags/Safari-600.1.10.1

Revision: 172676
Author: matthew_han...@apple.com
Date: 2014-08-15 19:23:43 -0700 (Fri, 15 Aug 2014)

Log Message

Merge r172019. <rdar://problem/18029617>


Modified Paths

tags/Safari-600.1.10.1/Source/WTF/ChangeLog
tags/Safari-600.1.10.1/Source/WTF/wtf/FeatureDefines.h
tags/Safari-600.1.10.1/Source/WebKit/ChangeLog
tags/Safari-600.1.10.1/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props
tags/Safari-600.1.10.1/WebKitLibraries/ChangeLog
tags/Safari-600.1.10.1/WebKitLibraries/win/tools/vsprops/FeatureDefines.props

Diff

Modified: tags/Safari-600.1.10.1/Source/WTF/ChangeLog (172675 => 172676)


--- tags/Safari-600.1.10.1/Source/WTF/ChangeLog	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/Source/WTF/ChangeLog	2014-08-16 02:23:43 UTC (rev 172676)
@@ -1,3 +1,16 @@
+2014-08-15  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r172019. <rdar://problem/18029617>
+
+    2014-08-04  Matthew Hanson  <matthew_han...@apple.com>
+    
+            [Win] Temporarily turn off WebGL.
+            https://bugs.webkit.org/show_bug.cgi?id=135543
+    
+            Landed on behalf of Brent Fulgham.
+    
+            * wtf/FeatureDefines.h: Turn off WebGL feature.
+    
 2014-07-30  Lucas Forschler  <lforsch...@apple.com>
 
         Merge r171825

Modified: tags/Safari-600.1.10.1/Source/WTF/wtf/FeatureDefines.h (172675 => 172676)


--- tags/Safari-600.1.10.1/Source/WTF/wtf/FeatureDefines.h	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/Source/WTF/wtf/FeatureDefines.h	2014-08-16 02:23:43 UTC (rev 172676)
@@ -249,9 +249,12 @@
 #define ENABLE_WEB_ARCHIVE 1
 #endif
 
+/*
+FIXME: Remove under https://bugs.webkit.org/show_bug.cgi?id=135543
 #if !defined(ENABLE_WEBGL)
 #define ENABLE_WEBGL 1
 #endif
+*/
 
 #endif /* PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) */

Modified: tags/Safari-600.1.10.1/Source/WebKit/ChangeLog (172675 => 172676)


--- tags/Safari-600.1.10.1/Source/WebKit/ChangeLog	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/Source/WebKit/ChangeLog	2014-08-16 02:23:43 UTC (rev 172676)
@@ -1,3 +1,19 @@
+2014-08-15  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r172019. <rdar://problem/18029617>
+
+    2014-08-04  Matthew Hanson  <matthew_han...@apple.com>
+    
+            [Win] Temporarily deactivate WebGL.
+            https://bugs.webkit.org/show_bug.cgi?id=135543
+    
+            Unreviewed build fix.
+    
+            Landed on behalf of Brent Fulgham.
+    
+            * WebKit.vcxproj/WebKit/WebKitCommon.props: Avoid
+            linking to ANGLE-based libraries.
+    
 2014-08-07  Dana Burkart <dburk...@apple.com>
 
         Merge r172241

Modified: tags/Safari-600.1.10.1/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props (172675 => 172676)


--- tags/Safari-600.1.10.1/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props	2014-08-16 02:23:43 UTC (rev 172676)
@@ -13,7 +13,7 @@
       <ForcedIncludeFiles>WebKitPrefix.h;ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libEGL.lib;libGLESv2.lib;preprocessor.lib;translator_common.lib;translator_glsl.lib;translator_hlsl.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;_javascript_Core$(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>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;_javascript_Core$(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>
       <ModuleDefinitionFile>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKitExportGenerator\WebKitExports.def</ModuleDefinitionFile>
       <DelayLoadDLLs>usp10.dll;comctl32.dll;version.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>

Modified: tags/Safari-600.1.10.1/WebKitLibraries/ChangeLog (172675 => 172676)


--- tags/Safari-600.1.10.1/WebKitLibraries/ChangeLog	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/WebKitLibraries/ChangeLog	2014-08-16 02:23:43 UTC (rev 172676)
@@ -1,3 +1,18 @@
+2014-08-15  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r172019. <rdar://problem/18029617>
+
+    2014-08-04  Matthew Hanson  <matthew_han...@apple.com>
+    
+            [Win] Temporarily turn off WebGL feature.
+            https://bugs.webkit.org/show_bug.cgi?id=135543
+    
+            Unreviewed build fix.
+    
+            Landed on behalf of Brent Fulgham.
+    
+            * win/tools/vsprops/FeatureDefines.props: Deactivate feature.
+    
 2014-08-14  Lucas Forschler  <lforsch...@apple.com>
 
         Merge r172604

Modified: tags/Safari-600.1.10.1/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (172675 => 172676)


--- tags/Safari-600.1.10.1/WebKitLibraries/win/tools/vsprops/FeatureDefines.props	2014-08-16 02:14:29 UTC (rev 172675)
+++ tags/Safari-600.1.10.1/WebKitLibraries/win/tools/vsprops/FeatureDefines.props	2014-08-16 02:23:43 UTC (rev 172676)
@@ -80,6 +80,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>
@@ -89,7 +90,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <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>
+<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_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_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -405,6 +406,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>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes