Title: [113633] trunk
- Revision
- 113633
- Author
- [email protected]
- Date
- 2012-04-09 15:40:03 -0700 (Mon, 09 Apr 2012)
Log Message
[BlackBerry] Allow simulator to use GLES2 acceleration
https://bugs.webkit.org/show_bug.cgi?id=81672
Patch by Ming Xie <[email protected]> on 2012-04-09
Reviewed by Rob Buis.
.:
* Source/cmake/OptionsBlackBerry.cmake:
Tools:
* Scripts/webkitdirs.pm:
(blackberryCMakeArguments):
Modified Paths
Diff
Modified: trunk/ChangeLog (113632 => 113633)
--- trunk/ChangeLog 2012-04-09 22:17:38 UTC (rev 113632)
+++ trunk/ChangeLog 2012-04-09 22:40:03 UTC (rev 113633)
@@ -1,3 +1,12 @@
+2012-04-09 Ming Xie <[email protected]>
+
+ [BlackBerry] Allow simulator to use GLES2 acceleration
+ https://bugs.webkit.org/show_bug.cgi?id=81672
+
+ Reviewed by Rob Buis.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2012-04-09 Zalan Bujtas <[email protected]>
[Qt][WK2] Fail to activate links after double tap gesture.
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (113632 => 113633)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-09 22:17:38 UTC (rev 113632)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-09 22:40:03 UTC (rev 113633)
@@ -18,7 +18,7 @@
SET(WTF_USE_OPENTYPE_SANITIZER 1)
ADD_DEFINITIONS(-DWTF_USE_OPENTYPE_SANITIZER=1)
-IF (TARGETING_PLAYBOOK)
+IF (ENABLE_GLES2)
SET(WTF_USE_ACCELERATED_COMPOSITING 1)
ADD_DEFINITIONS(-DWTF_USE_ACCELERATED_COMPOSITING=1)
ADD_DEFINITIONS(-DBLACKBERRY_PLATFORM_GRAPHICS_EGL=1)
@@ -153,7 +153,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WORKERS ON)
-IF (TARGETING_PLAYBOOK)
+IF (ENABLE_GLES2)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
ELSE ()
Modified: trunk/Tools/ChangeLog (113632 => 113633)
--- trunk/Tools/ChangeLog 2012-04-09 22:17:38 UTC (rev 113632)
+++ trunk/Tools/ChangeLog 2012-04-09 22:40:03 UTC (rev 113633)
@@ -1,3 +1,13 @@
+2012-04-09 Ming Xie <[email protected]>
+
+ [BlackBerry] Allow simulator to use GLES2 acceleration
+ https://bugs.webkit.org/show_bug.cgi?id=81672
+
+ Reviewed by Rob Buis.
+
+ * Scripts/webkitdirs.pm:
+ (blackberryCMakeArguments):
+
2012-04-09 Dana Jansens <[email protected]>
Mark myself as a committer
Modified: trunk/Tools/Scripts/webkitdirs.pm (113632 => 113633)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-04-09 22:17:38 UTC (rev 113632)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-04-09 22:40:03 UTC (rev 113633)
@@ -932,6 +932,7 @@
if ($cpu eq "a9") {
$cpu = $arch . "v7le";
push @cmakeExtraOptions, '-DTARGETING_PLAYBOOK=1';
+ push @cmakeExtraOptions, '-DENABLE_GLES2=1';
}
my $stageDir = $ENV{"STAGE_DIR"};
@@ -958,6 +959,7 @@
push @cmakeExtraOptions, "-DCMAKE_SKIP_RPATH='ON'" if isDarwin();
push @cmakeExtraOptions, "-DENABLE_DRT=1" if $ENV{"ENABLE_DRT"};
+ push @cmakeExtraOptions, "-DENABLE_GLES2=1" if $ENV{"ENABLE_GLES2"};
my @includeSystemDirectories;
push @includeSystemDirectories, File::Spec->catdir($stageInc, "grskia", "skia");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
