summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/port/platform/graphics/chromium/FontChromiumWin.cpp2
-rw-r--r--webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp b/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
index 8f94bad..5f85629 100644
--- a/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
+++ b/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
@@ -241,7 +241,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext,
UniscribeHelperTextRun state(run, *this);
SkColor color = context->fillColor();
- uint8 alpha = SkColorGetA(color);
+ unsigned char alpha = SkColorGetA(color);
// Skip 100% transparent text; no need to draw anything.
if (!alpha)
return;
diff --git a/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
index 5271ccf..6237990 100644
--- a/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -60,7 +60,7 @@ static bool IsCoordinateReasonable(float coord)
{
#ifdef CHECK_REASONABLE
// First check for valid floats.
-#if defined(COMPILER_MSVC)
+#if defined(_MSC_VER)
if (!_finite(coord))
#else
if (!finite(coord))