Title: [128154] trunk/Source/WebKit2
Revision
128154
Author
[email protected]
Date
2012-09-11 00:48:57 -0700 (Tue, 11 Sep 2012)

Log Message

[EFL][WK2] Add necessary include directory in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=95173

Unreviewed build fix.

revision r126694: Move TextureMapperGL to use
GraphicsContext3D. modify the TextureMapperGL.h to include
GraphicsContext3D.h. And when enable TEXTURE_MAPPER,
file WebKit2/Shared/ShareableSurface.cpp will include
TextureMapperGL.h then depends on GraphicsContext3D.h
thus it need to add ANGLE director. As currently, this
problem only affect EFL platform, according to Gyuyoung Kim's
suggestion, we add this include dir into EFL private file
PlatformEfl.cmake. Otherwise, the build will fail.

To trigger this problem by using the following command:
./Tools/Scripts/build-webkit --efl --3d-rendering --tiled-backing-store

Patch by Zhigang Gong <[email protected]> on 2012-09-11

* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (128153 => 128154)


--- trunk/Source/WebKit2/ChangeLog	2012-09-11 07:33:58 UTC (rev 128153)
+++ trunk/Source/WebKit2/ChangeLog	2012-09-11 07:48:57 UTC (rev 128154)
@@ -1,3 +1,25 @@
+2012-09-11  Zhigang Gong  <[email protected]>
+
+        [EFL][WK2] Add necessary include directory in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=95173
+
+        Unreviewed build fix.
+
+        revision r126694: Move TextureMapperGL to use
+        GraphicsContext3D. modify the TextureMapperGL.h to include
+        GraphicsContext3D.h. And when enable TEXTURE_MAPPER,
+        file WebKit2/Shared/ShareableSurface.cpp will include
+        TextureMapperGL.h then depends on GraphicsContext3D.h
+        thus it need to add ANGLE director. As currently, this
+        problem only affect EFL platform, according to Gyuyoung Kim's
+        suggestion, we add this include dir into EFL private file
+        PlatformEfl.cmake. Otherwise, the build will fail.
+
+        To trigger this problem by using the following command:
+        ./Tools/Scripts/build-webkit --efl --3d-rendering --tiled-backing-store
+
+        * CMakeLists.txt:
+
 2012-09-10  Byungwoo Lee  <[email protected]>
 
         [EFL][WK2] Build warning : fix warning about extended initializer lists on EWK2UnitTestBase.cpp.

Modified: trunk/Source/WebKit2/PlatformEfl.cmake (128153 => 128154)


--- trunk/Source/WebKit2/PlatformEfl.cmake	2012-09-11 07:33:58 UTC (rev 128153)
+++ trunk/Source/WebKit2/PlatformEfl.cmake	2012-09-11 07:48:57 UTC (rev 128154)
@@ -156,6 +156,12 @@
     ${WTF_DIR}
 )
 
+IF (WTF_USE_3D_GRAPHICS)
+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+        "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
+    )
+ENDIF ()
+
 LIST(APPEND WebKit2_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${ECORE_X_LIBRARIES}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to