Diff
Modified: trunk/Source/WebCore/ChangeLog (95486 => 95487)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 22:54:53 UTC (rev 95487)
@@ -1,5 +1,25 @@
2011-09-19 Adam Barth <[email protected]>
+ 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 <[email protected]>
+
Remove APPLICATION_CACHE_DYNAMIC_ENTRIES and associated code
https://bugs.webkit.org/show_bug.cgi?id=68407
Modified: trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/WOFFFileFormat.cpp 2011-09-19 22:54:53 UTC (rev 95487)
@@ -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 @@
} // namespace WebCore
-#endif // !ENABLE(OPENTYPE_SANITIZER)
+#endif // !USE(OPENTYPE_SANITIZER)
Modified: trunk/Source/WebCore/platform/graphics/WOFFFileFormat.h (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/WOFFFileFormat.h 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/WOFFFileFormat.h 2011-09-19 22:54:53 UTC (rev 95487)
@@ -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 @@
} // namespace WebCore
-#endif // !ENABLE(OPENTYPE_SANITIZER)
+#endif // !USE(OPENTYPE_SANITIZER)
#endif // WOFFFileFormat_h
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2011-09-19 22:54:53 UTC (rev 95487)
@@ -97,7 +97,7 @@
{
ASSERT_ARG(buffer, buffer);
-#if ENABLE(OPENTYPE_SANITIZER)
+#if USE(OPENTYPE_SANITIZER)
OpenTypeSanitizer sanitizer(buffer);
RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
if (!transcodeBuffer)
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.cpp 2011-09-19 22:54:53 UTC (rev 95487)
@@ -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 @@
} // namespace WebCore
-#endif // ENABLE(OPENTYPE_SANITIZER)
+#endif // USE(OPENTYPE_SANITIZER)
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeSanitizer.h 2011-09-19 22:54:53 UTC (rev 95487)
@@ -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 @@
} // namespace WebCore
-#endif // ENABLE(OPENTYPE_SANITIZER)
+#endif // USE(OPENTYPE_SANITIZER)
#endif // OpenTypeSanitizer_h
Modified: trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp (95486 => 95487)
--- trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp 2011-09-19 22:54:53 UTC (rev 95487)
@@ -170,7 +170,7 @@
{
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 @@
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
;
Modified: trunk/Source/WebKit/chromium/ChangeLog (95486 => 95487)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-19 22:54:53 UTC (rev 95487)
@@ -1,3 +1,12 @@
+2011-09-19 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r95385 and r95457.
Modified: trunk/Source/WebKit/chromium/features.gypi (95486 => 95487)
--- trunk/Source/WebKit/chromium/features.gypi 2011-09-19 22:53:04 UTC (rev 95486)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-09-19 22:54:53 UTC (rev 95487)
@@ -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',
],
