Diff
Modified: trunk/Source/WebCore/ChangeLog (123149 => 123150)
--- trunk/Source/WebCore/ChangeLog 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebCore/ChangeLog 2012-07-19 21:54:19 UTC (rev 123150)
@@ -1,3 +1,16 @@
+2012-07-19 No'am Rosenthal <[email protected]>
+
+ [Qt] Enable CSS shaders in Qt (software mode)
+ https://bugs.webkit.org/show_bug.cgi?id=85140
+
+ Reviewed by Simon Hausmann.
+
+ Added missing files to the Qt build.
+
+ No new tests, WebGL is still disabled by default in the bots.
+
+ * Target.pri:
+
2012-07-17 Dmitry Titov <[email protected]>
[Chromium] Out of Memory is observed when a large object is passed to a Web Worker.
Modified: trunk/Source/WebCore/Target.pri (123149 => 123150)
--- trunk/Source/WebCore/Target.pri 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebCore/Target.pri 2012-07-19 21:54:19 UTC (rev 123150)
@@ -3679,6 +3679,8 @@
platform/graphics/Extensions3D.h \
platform/graphics/GraphicsContext3D.h \
platform/graphics/gpu/DrawingBuffer.h \
+ platform/graphics/gpu/Texture.h \
+ platform/graphics/gpu/TilingData.h \
platform/graphics/opengl/Extensions3DOpenGL.h \
platform/graphics/texmap/TextureMapperGL.h \
platform/graphics/texmap/TextureMapperShaderManager.h
@@ -3688,6 +3690,8 @@
platform/graphics/GraphicsContext3D.cpp \
platform/graphics/gpu/DrawingBuffer.cpp \
platform/graphics/gpu/qt/DrawingBufferQt.cpp \
+ platform/graphics/gpu/Texture.cpp \
+ platform/graphics/gpu/TilingData.cpp \
platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp \
platform/graphics/opengl/Extensions3DOpenGLCommon.cpp \
platform/graphics/qt/GraphicsContext3DQt.cpp \
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (123149 => 123150)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-07-19 21:54:19 UTC (rev 123150)
@@ -162,6 +162,10 @@
global->attributes.value(QWebSettings::WebGLEnabled));
settings->setWebGLEnabled(value);
+#if ENABLE(CSS_SHADERS)
+ // For now, enable CSS shaders when WebGL is enabled.
+ settings->setCSSCustomFilterEnabled(value);
+#endif
#if USE(ACCELERATED_COMPOSITING)
settings->setAcceleratedCompositingForCanvasEnabled(value);
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (123149 => 123150)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-19 21:54:19 UTC (rev 123150)
@@ -1,3 +1,15 @@
+2012-07-19 No'am Rosenthal <[email protected]>
+
+ [Qt] Enable CSS shaders in Qt (software mode)
+ https://bugs.webkit.org/show_bug.cgi?id=85140
+
+ Reviewed by Simon Hausmann.
+
+ Enable CSS Shaders in settings when WebGL is enabled.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply):
+
2012-07-19 Simon Hausmann <[email protected]>
[Qt] Remove support for Qt versions before 4.8.0
Modified: trunk/Source/WebKit2/ChangeLog (123149 => 123150)
--- trunk/Source/WebKit2/ChangeLog 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-19 21:54:19 UTC (rev 123150)
@@ -1,3 +1,17 @@
+2012-07-19 No'am Rosenthal <[email protected]>
+
+ [Qt] Enable CSS shaders in Qt (software mode)
+ https://bugs.webkit.org/show_bug.cgi?id=85140
+
+ Reviewed by Simon Hausmann.
+
+ Add CSSCustomFilterEnabled to QWebPreferences. It's disabled by default.
+
+ * UIProcess/API/qt/qwebpreferences.cpp:
+ (QWebPreferencesPrivate::testAttribute):
+ (QWebPreferencesPrivate::setAttribute):
+ * UIProcess/API/qt/qwebpreferences_p_p.h:
+
2012-07-19 Pierre Rossi <[email protected]>
[Qt][WK2] Map the elementRect exposed in QML to the view for popup menu
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp (123149 => 123150)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-07-19 21:54:19 UTC (rev 123150)
@@ -66,7 +66,11 @@
#if ENABLE(WEBGL)
case WebGLEnabled:
return WKPreferencesGetWebGLEnabled(preferencesRef());
+#if ENABLE(CSS_SHADERS)
+ case CSSCustomFilterEnabled:
+ return WKPreferencesGetCSSCustomFilterEnabled(preferencesRef());
#endif
+#endif
default:
ASSERT_NOT_REACHED();
return false;
@@ -114,7 +118,12 @@
case WebGLEnabled:
WKPreferencesSetWebGLEnabled(preferencesRef(), enable);
break;
+#if ENABLE(CSS_SHADERS)
+ case CSSCustomFilterEnabled:
+ WKPreferencesSetCSSCustomFilterEnabled(preferencesRef(), enable);
+ break;
#endif
+#endif
default:
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h (123149 => 123150)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-07-19 21:54:19 UTC (rev 123150)
@@ -39,7 +39,8 @@
PrivateBrowsingEnabled,
DnsPrefetchEnabled,
DeveloperExtrasEnabled,
- WebGLEnabled
+ WebGLEnabled,
+ CSSCustomFilterEnabled
};
enum FontFamily {
Modified: trunk/Tools/ChangeLog (123149 => 123150)
--- trunk/Tools/ChangeLog 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Tools/ChangeLog 2012-07-19 21:54:19 UTC (rev 123150)
@@ -1,3 +1,14 @@
+2012-07-19 No'am Rosenthal <[email protected]>
+
+ [Qt] Enable CSS shaders in Qt (software mode)
+ https://bugs.webkit.org/show_bug.cgi?id=85140
+
+ Reviewed by Simon Hausmann.
+
+ Enable CSS_SHADERS when WEBGL and CSS_FILTERS are enabled.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-07-19 Dirk Pranke <[email protected]>
test-webkitpy: fix executive_unittest nits, including a missing 'errno' import
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (123149 => 123150)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-19 21:40:37 UTC (rev 123149)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-19 21:54:19 UTC (rev 123150)
@@ -112,6 +112,12 @@
contains(QT_CONFIG, opengl):!win32-*: DEFINES += ENABLE_WEBGL=1
}
+# CSS Shaders support
+!contains(DEFINES, ENABLE_CSS_SHADERS=.) {
+ # Enable CSS shaders when CSS filters and WebGL are enabled.
+ contains(DEFINES, ENABLE_CSS_FILTERS=1):contains(DEFINES, ENABLE_WEBGL=1): DEFINES += ENABLE_CSS_SHADERS=1
+}
+
!contains(DEFINES, ENABLE_XSLT=.) {
# Using QtXmlPatterns
contains(QT_CONFIG, xmlpatterns): DEFINES += ENABLE_XSLT=1
