Merge r173999 - [GTK] Enable CSS_IMAGE_SET in production builds

https://bugs.webkit.org/show_bug.cgi?id=137142 Reviewed by Alejandro G. Castro. This is required by the inspector to show some of the icons that has a HiDPI variant. * Source/cmake/OptionsGTK.cmake:
WebKit · Sep 26, 2014 · e6a773d · e6a773d
1 parent 13789ab
commit e6a773d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2014-09-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Enable CSS_IMAGE_SET in production builds
+        https://bugs.webkit.org/show_bug.cgi?id=137142
+
+        Reviewed by Alejandro G. Castro.
+
+        This is required by the inspector to show some of the icons that
+        has a HiDPI variant.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2014-09-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.4.6 release.

diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4
@@ -100,7 +100,7 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
     ENABLE_CSS_EXCLUSIONS=0 \
     ENABLE_CSS_IMAGE_ORIENTATION=0 \
     ENABLE_CSS_IMAGE_RESOLUTION=0 \
-    ENABLE_CSS_IMAGE_SET=0 \
+    ENABLE_CSS_IMAGE_SET=1 \
     ENABLE_CSS_REGIONS=1 \
     ENABLE_CSS_SHAPES=0 \
     ENABLE_CSS_STICKY_POSITION=1 \