diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 21:59:57 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 21:59:57 +0000 |
| commit | b9700fe362c89fa62f6eae83c0e491e0afa7ac63 (patch) | |
| tree | 06a3b7f340da69b3e0a67f2e18989b80fb71f912 /webkit | |
| parent | f2f0a6fe6ea3b0eff50bdbc6ffc8c65b7559912f (diff) | |
| download | chromium_src-b9700fe362c89fa62f6eae83c0e491e0afa7ac63.zip chromium_src-b9700fe362c89fa62f6eae83c0e491e0afa7ac63.tar.gz chromium_src-b9700fe362c89fa62f6eae83c0e491e0afa7ac63.tar.bz2 | |
Add missing files from previous checkin.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/port/platform/graphics/chromium/FontChromiumWin.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp | 2 |
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)) |