Diff
Modified: trunk/LayoutTests/ChangeLog (111892 => 111893)
--- trunk/LayoutTests/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/LayoutTests/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,14 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Add css3/filters/custom to the skipped list.
+
+ Reviewed by Simon Fraser.
+
+ * platform/mac/Skipped:
+
2012-03-23 Dan Bernstein <[email protected]>
Updated Mac expected results for these tests by reverting r111339, now that bug 81826 was
Modified: trunk/LayoutTests/platform/mac/Skipped (111892 => 111893)
--- trunk/LayoutTests/platform/mac/Skipped 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-03-23 20:18:55 UTC (rev 111893)
@@ -469,6 +469,9 @@
# Font feature settings is not implemented.
css3/font-feature-settings-rendering.html
+# CSS Shaders not enabled
+css3/filters/custom
+
# This test verifies that a mismatch reftest will fail as intended if both results are same.
fast/harness/sample-fail-mismatch-reftest.html
Modified: trunk/Source/_javascript_Core/ChangeLog (111892 => 111893)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,14 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Remove ENABLE_CSS_SHADERS from FeatureDefines. It's now in Platform.h.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-03-23 Gavin Barraclough <[email protected]>
RexExp constructor last match properties should not rely on previous ovector
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (111892 => 111893)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-03-23 20:18:55 UTC (rev 111893)
@@ -74,7 +74,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
-ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
ENABLE_DATA_TRANSFER_ITEMS = ;
ENABLE_DETAILS = ENABLE_DETAILS;
ENABLE_DEVICE_ORIENTATION = ;
Modified: trunk/Source/WTF/ChangeLog (111892 => 111893)
--- trunk/Source/WTF/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WTF/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,15 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Put ENABLE_CSS_SHADERS into Platform.h, but disable for
+ Apple builds.
+
+ * wtf/Platform.h:
+
2012-03-23 Tony Chang <[email protected]>
[chromium] rename newwtf target back to wtf
Modified: trunk/Source/WTF/wtf/Platform.h (111892 => 111893)
--- trunk/Source/WTF/wtf/Platform.h 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WTF/wtf/Platform.h 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1070,6 +1070,12 @@
#define ENABLE_CSS_IMAGE_SET 1
#endif
+#if !defined(ENABLE_CSS_SHADERS)
+#if PLATFORM(MAC) || PLATFORM(IOS)
+#define ENABLE_CSS_SHADERS 0
+#endif
+#endif
+
/* Compositing on the UI-process in WebKit2 */
#if PLATFORM(QT)
#define WTF_USE_UI_SIDE_COMPOSITING 1
Modified: trunk/Source/WebCore/ChangeLog (111892 => 111893)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,14 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Remove ENABLE_CSS_SHADERS from FeatureDefines. It's now in Platform.h.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-03-23 Dave Michael <[email protected]>
Relanding(r111754): HTMLPluginElement is not destroyed on reload or navigation if getNPObject is called
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (111892 => 111893)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-03-23 20:18:55 UTC (rev 111893)
@@ -74,7 +74,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
-ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
ENABLE_DATA_TRANSFER_ITEMS = ;
ENABLE_DETAILS = ENABLE_DETAILS;
ENABLE_DEVICE_ORIENTATION = ;
Modified: trunk/Source/WebKit/mac/ChangeLog (111892 => 111893)
--- trunk/Source/WebKit/mac/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,14 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Remove ENABLE_CSS_SHADERS from FeatureDefines. It's now in Platform.h.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-03-22 Gyuyoung Kim <[email protected]>
Convert hasGrammarMarker to use Internals interface
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (111892 => 111893)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-03-23 20:18:55 UTC (rev 111893)
@@ -74,7 +74,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
-ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
ENABLE_DATA_TRANSFER_ITEMS = ;
ENABLE_DETAILS = ENABLE_DETAILS;
ENABLE_DEVICE_ORIENTATION = ;
Modified: trunk/Source/WebKit2/ChangeLog (111892 => 111893)
--- trunk/Source/WebKit2/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,14 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Remove ENABLE_CSS_SHADERS from FeatureDefines. It's now in Platform.h.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-03-23 Dave Michael <[email protected]>
Relanding(r111754): HTMLPluginElement is not destroyed on reload or navigation if getNPObject is called
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (111892 => 111893)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-03-23 20:18:55 UTC (rev 111893)
@@ -74,7 +74,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
-ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
ENABLE_DATA_TRANSFER_ITEMS = ;
ENABLE_DETAILS = ENABLE_DETAILS;
ENABLE_DEVICE_ORIENTATION = ;
Modified: trunk/Tools/ChangeLog (111892 => 111893)
--- trunk/Tools/ChangeLog 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Tools/ChangeLog 2012-03-23 20:18:55 UTC (rev 111893)
@@ -1,3 +1,15 @@
+2012-03-23 Dean Jackson <[email protected]>
+
+ Disable CSS_SHADERS in Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=81996
+
+ Reviewed by Simon Fraser.
+
+ Default enableCSSShaders to be 0 on all builds that use
+ this script. Use the flag to turn it back on.
+
+ * Scripts/build-webkit:
+
2012-03-23 Tony Chang <[email protected]>
[chromium] rename newwtf target back to wtf
Modified: trunk/Tools/Scripts/build-webkit (111892 => 111893)
--- trunk/Tools/Scripts/build-webkit 2012-03-23 20:07:33 UTC (rev 111892)
+++ trunk/Tools/Scripts/build-webkit 2012-03-23 20:18:55 UTC (rev 111893)
@@ -177,7 +177,7 @@
define => "ENABLE_CSS_GRID_LAYOUT", default => 0, value => \$cssGridLayoutSupport },
{ option => "css-shaders", desc => "Toggle CSS Shaders (within CSS Filters) support",
- define => "ENABLE_CSS_SHADERS", default => isAppleWebKit(), value => \$cssShadersSupport },
+ define => "ENABLE_CSS_SHADERS", default => 0, value => \$cssShadersSupport },
{ option => "coverage", desc => "Toggle code coverage support",
define => "", default => 0, value => \$coverageSupport },
