Enable OpenType Sanitizer for BlackBerry port.
authorefidler@rim.com <efidler@rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Mar 2012 23:26:53 +0000 (23:26 +0000)
committerefidler@rim.com <efidler@rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Mar 2012 23:26:53 +0000 (23:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82782

Reviewed by Eric Seidel.

.:

* Source/cmake/OptionsBlackBerry.cmake: define USE(OPENTYPE_SANITIZER)

Source/WebKit:

* PlatformBlackBerry.cmake: add libots to link

Tools:

* Scripts/webkitdirs.pm:
(blackberryCMakeArguments): add OTS to include path

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit/ChangeLog
Source/WebKit/PlatformBlackBerry.cmake
Source/cmake/OptionsBlackBerry.cmake
Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index a9fc46b..0c69ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-30  Eli Fidler  <efidler@rim.com>
+
+        Enable OpenType Sanitizer for BlackBerry port.
+        https://bugs.webkit.org/show_bug.cgi?id=82782
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsBlackBerry.cmake: define USE(OPENTYPE_SANITIZER)
+
 2012-03-30  Zalan Bujtas  <zbujtas@gmail.com>
 
         Fix defective size_t overflow in GestureTapHighlighter.
index b731bd9..7592f99 100644 (file)
@@ -1,3 +1,12 @@
+2012-03-30  Eli Fidler  <efidler@rim.com>
+
+        Enable OpenType Sanitizer for BlackBerry port.
+        https://bugs.webkit.org/show_bug.cgi?id=82782
+
+        Reviewed by Eric Seidel.
+
+        * PlatformBlackBerry.cmake: add libots to link
+
 2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
 
         [CMake] Unreviewed build fix after r111778.
index f78412a..6230ff1 100644 (file)
@@ -124,6 +124,7 @@ LIST(APPEND WebKit_LIBRARIES
     ${MMR_LIBRARY}
     ${M_LIBRARY}
     ${NBUTIL_LIBRARY}
+    ${OTS_LIBRARY}
     ${PNG_LIBRARY}
     ${PPSCache_LIBRARY}
     ${SQLITE3_LIBRARY}
index 0b87eae..ee127ba 100644 (file)
@@ -15,6 +15,8 @@ ADD_DEFINITIONS(-DSK_RELEASE)
 # TODO: Make this build-time configurable
 SET(WTF_USE_PTHREADS 1)
 ADD_DEFINITIONS(-DWTF_USE_PTHREADS=1)
+SET(WTF_USE_OPENTYPE_SANITIZER 1)
+ADD_DEFINITIONS(-DWTF_USE_OPENTYPE_SANITIZER=1)
 
 IF (TARGETING_PLAYBOOK)
     SET(WTF_USE_ACCELERATED_COMPOSITING 1)
@@ -84,6 +86,7 @@ FIND_STAGING_LIBRARY(HARFBUZZ_LIBRARY harfbuzz)
 FIND_STAGING_LIBRARY(FONTCONFIG_LIBRARY fontconfig)
 FIND_STAGING_LIBRARY(PROFILING_LIBRARY profilingS)
 FIND_STAGING_LIBRARY(LIB_INPUT_UTILITIES input_utilities)
+FIND_STAGING_LIBRARY(OTS_LIBRARY ots)
 
 # Show unresolved symbols when doing the final shared object link
 IF (PROFILING)
index 4ae1389..6e2a97c 100644 (file)
@@ -1,3 +1,13 @@
+2012-03-30  Eli Fidler  <efidler@rim.com>
+
+        Enable OpenType Sanitizer for BlackBerry port.
+        https://bugs.webkit.org/show_bug.cgi?id=82782
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitdirs.pm:
+        (blackberryCMakeArguments): add OTS to include path
+
 2012-03-30  Simon Fraser  <simon.fraser@apple.com>
 
         run-webkit-tests needs to set DYLD_LIBRARY_PATH as well
index a32ea1e..c144870 100755 (executable)
@@ -967,6 +967,7 @@ sub blackberryCMakeArguments()
     push @includeSystemDirectories, $stageInc;
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform");
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "qsk");
+    push @includeSystemDirectories, File::Spec->catdir($stageInc, "ots");
 
     my @cxxFlags;
     push @cxxFlags, "-Wl,-rpath-link,$stageLib";