Rename ENABLE(OPENTYPE_SANITIZER) to USE(OPENTYPE_SANITIZER)

https://bugs.webkit.org/show_bug.cgi?id=68292

Reviewed by Eric Seidel.

Source/WebCore:

OpenType Sanitizer is a library for sanitizing type and not a feature.
Therefore this macro should say that we USE the library.

* platform/graphics/WOFFFileFormat.cpp:
* platform/graphics/WOFFFileFormat.h:
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData):
* platform/graphics/opentype/OpenTypeSanitizer.cpp:
* platform/graphics/opentype/OpenTypeSanitizer.h:
* platform/graphics/skia/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData):
(WebCore::FontCustomPlatformData::supportsFormat):

Source/WebKit/chromium:

* features.gypi:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f5ecdd2..30b300f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,25 @@
 2011-09-19  Adam Barth  <abarth@webkit.org>
 
+        Rename ENABLE(OPENTYPE_SANITIZER) to USE(OPENTYPE_SANITIZER)
+        https://bugs.webkit.org/show_bug.cgi?id=68292
+
+        Reviewed by Eric Seidel.
+
+        OpenType Sanitizer is a library for sanitizing type and not a feature.
+        Therefore this macro should say that we USE the library.
+
+        * platform/graphics/WOFFFileFormat.cpp:
+        * platform/graphics/WOFFFileFormat.h:
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::createFontCustomPlatformData):
+        * platform/graphics/opentype/OpenTypeSanitizer.cpp:
+        * platform/graphics/opentype/OpenTypeSanitizer.h:
+        * platform/graphics/skia/FontCustomPlatformData.cpp:
+        (WebCore::createFontCustomPlatformData):
+        (WebCore::FontCustomPlatformData::supportsFormat):
+
+2011-09-19  Adam Barth  <abarth@webkit.org>
+
         Remove APPLICATION_CACHE_DYNAMIC_ENTRIES and associated code
         https://bugs.webkit.org/show_bug.cgi?id=68407
 

diff --git a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp
index d54f3df..084fe63 100644 (file)
--- a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -27,7 +27,7 @@
 #include "WOFFFileFormat.h"
 #include <zlib.h>
 
-#if !ENABLE(OPENTYPE_SANITIZER)
+#if !USE(OPENTYPE_SANITIZER)
 
 #include "SharedBuffer.h"
 
@@ -251,4 +251,4 @@ bool convertWOFFToSfnt(SharedBuffer* woff, Vector<char>& sfnt)
     
 } // namespace WebCore
 
-#endif // !ENABLE(OPENTYPE_SANITIZER)
+#endif // !USE(OPENTYPE_SANITIZER)

diff --git a/Source/WebCore/platform/graphics/WOFFFileFormat.h b/Source/WebCore/platform/graphics/WOFFFileFormat.h
index 9351d0e..4face9b 100644 (file)
--- a/Source/WebCore/platform/graphics/WOFFFileFormat.h
+++ b/Source/WebCore/platform/graphics/WOFFFileFormat.h
@@ -26,7 +26,7 @@
 #ifndef WOFFFileFormat_h
 #define WOFFFileFormat_h
 
-#if !ENABLE(OPENTYPE_SANITIZER)
+#if !USE(OPENTYPE_SANITIZER)
 
 #include <wtf/Vector.h>
 
@@ -43,6 +43,6 @@ bool convertWOFFToSfnt(SharedBuffer* woff, Vector<char>& sfnt);
 
 } // namespace WebCore
 
-#endif // !ENABLE(OPENTYPE_SANITIZER)
+#endif // !USE(OPENTYPE_SANITIZER)
 
 #endif // WOFFFileFormat_h

diff --git a/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
index 9c9eb8c..289cc6c 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
+++ b/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
@@ -97,7 +97,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 {
     ASSERT_ARG(buffer, buffer);
 
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
     OpenTypeSanitizer sanitizer(buffer);
     RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
     if (!transcodeBuffer)

diff --git a/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp b/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp
index 14aed0d..e3ac1ff 100644 (file)
--- a/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp
+++ b/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
 #include "OpenTypeSanitizer.h"
 
 #include "SharedBuffer.h"
@@ -66,4 +66,4 @@ PassRefPtr<SharedBuffer> OpenTypeSanitizer::sanitize()
 
 } // namespace WebCore
 
-#endif // ENABLE(OPENTYPE_SANITIZER)
+#endif // USE(OPENTYPE_SANITIZER)

diff --git a/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h b/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h
index 3f93448..5dca0fc 100644 (file)
--- a/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h
+++ b/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h
@@ -31,7 +31,7 @@
 #ifndef OpenTypeSanitizer_h
 #define OpenTypeSanitizer_h
 
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -53,5 +53,5 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(OPENTYPE_SANITIZER)
+#endif // USE(OPENTYPE_SANITIZER)
 #endif // OpenTypeSanitizer_h

diff --git a/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
index a808409..c546f3f 100644 (file)
--- a/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
+++ b/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
@@ -170,7 +170,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 {
     ASSERT_ARG(buffer, buffer);
 
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
     OpenTypeSanitizer sanitizer(buffer);
     RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
     if (!transcodeBuffer)
@@ -203,7 +203,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 bool FontCustomPlatformData::supportsFormat(const String& format)
 {
     return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype")
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
         || equalIgnoringCase(format, "woff")
 #endif
     ;

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index ff1fb9d..b231675 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-19  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(OPENTYPE_SANITIZER) to USE(OPENTYPE_SANITIZER)
+        https://bugs.webkit.org/show_bug.cgi?id=68292
+
+        Reviewed by Eric Seidel.
+
+        * features.gypi:
+
 2011-09-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r95385 and r95457.

diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
index 90e2ef2..87afe25 100644 (file)
--- a/Source/WebKit/chromium/features.gypi
+++ b/Source/WebKit/chromium/features.gypi
@@ -64,7 +64,6 @@
       'ENABLE_MHTML=1',
       'ENABLE_NOTIFICATIONS=1',
       'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
-      'ENABLE_OPENTYPE_SANITIZER=1',
       'ENABLE_ORIENTATION_EVENTS=0',
       'ENABLE_PAGE_VISIBILITY_API=1',
       'ENABLE_PROGRESS_TAG=1',
@@ -94,6 +93,7 @@
       # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
       # We can't define it here because it should be present only
       # in Debug or release_valgrind_build=1 builds.
+      'WTF_USE_OPENTYPE_SANITIZER=1',
       'WTF_USE_WEBP=1',
       'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
     ],