Title: [121226] trunk/Source/WebCore
- Revision
- 121226
- Author
- hausm...@webkit.org
- Date
- 2012-06-25 21:41:25 -0700 (Mon, 25 Jun 2012)
Log Message
Unreviewed build fix after r121223.
Fix the --minimal Qt build, TextureMapperGL now requires WebGL to be enabled.
* Target.pri:
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121225 => 121226)
--- trunk/Source/WebCore/ChangeLog 2012-06-26 04:31:48 UTC (rev 121225)
+++ trunk/Source/WebCore/ChangeLog 2012-06-26 04:41:25 UTC (rev 121226)
@@ -1,3 +1,12 @@
+2012-06-25 Simon Hausmann <simon.hausm...@nokia.com>
+
+ Unreviewed build fix after r121223.
+
+ Fix the --minimal Qt build, TextureMapperGL now requires WebGL to be enabled.
+
+ * Target.pri:
+ * WebCore.pri:
+
2012-06-25 Dana Jansens <dan...@chromium.org>
[chromium] CCOverdrawMetrics should use the deviceViewportSize to count actual pixels
Modified: trunk/Source/WebCore/Target.pri (121225 => 121226)
--- trunk/Source/WebCore/Target.pri 2012-06-26 04:31:48 UTC (rev 121225)
+++ trunk/Source/WebCore/Target.pri 2012-06-26 04:41:25 UTC (rev 121226)
@@ -4146,7 +4146,7 @@
platform/graphics/texmap/TextureMapperLayer.cpp \
platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
- !win32-*:contains(QT_CONFIG, opengl) {
+ contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1) {
HEADERS += \
platform/graphics/texmap/TextureMapperGL.h \
platform/graphics/texmap/TextureMapperShaderManager.h
@@ -4156,7 +4156,6 @@
platform/graphics/texmap/TextureMapperShaderManager.cpp
CONFIG += opengl-shims
- DEFINES += WTF_USE_TEXTURE_MAPPER_GL
}
} else {
HEADERS += platform/graphics/qt/GraphicsLayerQt.h
Modified: trunk/Source/WebCore/WebCore.pri (121225 => 121226)
--- trunk/Source/WebCore/WebCore.pri 2012-06-26 04:31:48 UTC (rev 121225)
+++ trunk/Source/WebCore/WebCore.pri 2012-06-26 04:41:25 UTC (rev 121226)
@@ -213,7 +213,9 @@
contains(CONFIG, texmap) {
DEFINES += WTF_USE_TEXTURE_MAPPER=1
- !win32-*:contains(QT_CONFIG, opengl) {
+ # TextureMapperGL requires stuff from GraphicsContext3D, hence the WebGL
+ # dependency.
+ !win32-*:contains(QT_CONFIG, opengl):contains(DEFINES, ENABLE_WEBGL=1) {
DEFINES += WTF_USE_TEXTURE_MAPPER_GL=1
contains(QT_CONFIG, opengles2): LIBS += -lEGL
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
