Diff
Modified: trunk/Source/WebCore/ChangeLog (97572 => 97573)
--- trunk/Source/WebCore/ChangeLog 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/ChangeLog 2011-10-16 05:59:12 UTC (rev 97573)
@@ -1,3 +1,23 @@
+2011-10-15 Adam Barth <[email protected]>
+
+ Rename ENABLE(SKIA_TEXT) to USE(SKIA_TEXT)
+ https://bugs.webkit.org/show_bug.cgi?id=70191
+
+ Reviewed by Daniel Bates.
+
+ SKIA_TEXT is not a WebKit feature. It's a macro that determines
+ whether we use a feature of the underly library (Skia).
+
+ * platform/graphics/chromium/FontChromiumWin.cpp:
+ (WebCore::Font::drawComplexText):
+ * platform/graphics/chromium/UniscribeHelper.cpp:
+ (WebCore::UniscribeHelper::draw):
+ * platform/graphics/skia/PlatformContextSkia.cpp:
+ (WebCore::PlatformContextSkia::isNativeFontRenderingAllowed):
+ * platform/graphics/skia/PlatformContextSkia.h:
+ * platform/graphics/skia/SkiaFontWin.cpp:
+ * platform/graphics/skia/SkiaFontWin.h:
+
2011-10-15 Eric Carlson <[email protected]>
Make VIDEO_TRACK compile with warnings as errors enabled
Modified: trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-16 05:59:12 UTC (rev 97573)
@@ -41,7 +41,7 @@
#include "SkiaFontWin.h"
#include "UniscribeHelperTextRun.h"
-#if !ENABLE(SKIA_TEXT)
+#if !USE(SKIA_TEXT)
#include "TransparencyWin.h"
#include "skia/ext/skia_utils_win.h"
#endif
@@ -52,7 +52,7 @@
namespace WebCore {
-#if !ENABLE(SKIA_TEXT)
+#if !USE(SKIA_TEXT)
namespace {
bool canvasHasMultipleLayers(const SkCanvas* canvas)
@@ -380,7 +380,7 @@
return false;
}
-#if ENABLE(SKIA_TEXT)
+#if USE(SKIA_TEXT)
void Font::drawGlyphs(GraphicsContext* graphicsContext,
const SimpleFontData* font,
const GlyphBuffer& glyphBuffer,
@@ -575,7 +575,7 @@
if (!alpha && graphicsContext->platformContext()->getStrokeStyle() == NoStroke)
return;
-#if ENABLE(SKIA_TEXT)
+#if USE(SKIA_TEXT)
HDC hdc = 0;
#else
TransparencyAwareUniscribePainter painter(graphicsContext, this, run, from, to, point);
Modified: trunk/Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp 2011-10-16 05:59:12 UTC (rev 97573)
@@ -318,7 +318,7 @@
HGDIOBJ oldFont = 0;
int curX = x;
bool firstRun = true;
-#if !ENABLE(SKIA_TEXT)
+#if !USE(SKIA_TEXT)
bool useWindowsDrawing = windowsCanHandleTextDrawing(graphicsContext);
#endif
@@ -399,7 +399,7 @@
// Pass 0 in when there is no justification.
const int* justify = shaping.m_justify.size() == 0 ? 0 : &shaping.m_justify[fromGlyph];
-#if ENABLE(SKIA_TEXT)
+#if USE(SKIA_TEXT)
const int* advances = shaping.m_justify.size() ?
&shaping.m_justify[fromGlyph]
: &shaping.m_advance[fromGlyph];
@@ -418,7 +418,7 @@
// adjusted for each font.
bool textOutOk = false;
for (int executions = 0; executions < 2; ++executions) {
-#if ENABLE(SKIA_TEXT)
+#if USE(SKIA_TEXT)
SkPoint origin;
origin.fX = curX + + innerOffset;
origin.fY = y + m_ascent;
Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2011-10-16 05:59:12 UTC (rev 97573)
@@ -581,7 +581,7 @@
bool PlatformContextSkia::isNativeFontRenderingAllowed()
{
-#if ENABLE(SKIA_TEXT)
+#if USE(SKIA_TEXT)
return false;
#else
if (isAccelerated())
Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.h 2011-10-16 05:59:12 UTC (rev 97573)
@@ -170,7 +170,7 @@
// Returns if the context allows rendering of fonts using native platform
// APIs. If false is returned font rendering is performed using the skia
// text drawing APIs.
- // if SKIA_TEXT is enabled, this always returns false
+ // if USE(SKIA_TEXT) is enabled, this always returns false
bool isNativeFontRenderingAllowed();
void getImageResamplingHint(IntSize* srcSize, FloatSize* dstSize) const;
Modified: trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-16 05:59:12 UTC (rev 97573)
@@ -43,7 +43,7 @@
namespace WebCore {
-#if !ENABLE(SKIA_TEXT)
+#if !USE(SKIA_TEXT)
bool windowsCanHandleDrawTextShadow(GraphicsContext* context)
{
FloatSize shadowOffset;
Modified: trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.h (97572 => 97573)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.h 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.h 2011-10-16 05:59:12 UTC (rev 97573)
@@ -41,7 +41,7 @@
class GraphicsContext;
class PlatformContextSkia;
-#if !ENABLE(SKIA_TEXT)
+#if !USE(SKIA_TEXT)
// The functions below are used for more complex font drawing (effects such as
// stroking and more complex transforms) than Windows supports directly. Since
// Windows drawing is faster you should use windowsCanHandleTextDrawing first to
Modified: trunk/Source/WebKit/chromium/ChangeLog (97572 => 97573)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-16 05:59:12 UTC (rev 97573)
@@ -1,5 +1,14 @@
2011-10-15 Adam Barth <[email protected]>
+ Rename ENABLE(SKIA_TEXT) to USE(SKIA_TEXT)
+ https://bugs.webkit.org/show_bug.cgi?id=70191
+
+ Reviewed by Daniel Bates.
+
+ * features.gypi:
+
+2011-10-15 Adam Barth <[email protected]>
+
Remove unused ENABLE(SKIA_GPU)
https://bugs.webkit.org/show_bug.cgi?id=70192
Modified: trunk/Source/WebKit/chromium/features.gypi (97572 => 97573)
--- trunk/Source/WebKit/chromium/features.gypi 2011-10-16 05:00:15 UTC (rev 97572)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-10-16 05:59:12 UTC (rev 97573)
@@ -79,7 +79,6 @@
'ENABLE_RUBY=1',
'ENABLE_SANDBOX=1',
'ENABLE_SHARED_WORKERS=1',
- 'ENABLE_SKIA_TEXT=<(enable_skia_text)',
'ENABLE_SMOOTH_SCROLLING=1',
'ENABLE_SQL_DATABASE=1',
'ENABLE_SVG=<(enable_svg)',
@@ -102,6 +101,7 @@
# 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_SKIA_TEXT=<(enable_skia_text)',
'WTF_USE_WEBP=1',
'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
],
