This CL updates chrome to the latest version of skia, retrieved via DEPS, and

placed in third_party.  All relevant skia changes (for all 3 platforms) have
been upstreamed.

Most of this CL is mind-numbingly repetitive.  Things of interest are:  skia.gyp
(now points at third_party versions), DEPS, and SkUserConfig.h.  stdint.h:  Skia
now requires C99 integer types, which MSVC doesn't support natively.  I have put
typedefs in config/win/stdint.h.

Note that the new version of skia appears to render rects whose coordinates
are "backwards" (ie., x2 < x1 or y2 < y1), which were formerly culled.  There
were a couple obvious instances of this in the code which I fixed, but there may
be more.

There were ~35 layout test failures due to minor pixel differences which I
rebaselined on Windows and Linux, and 8 genuine failures related to masks and
stroked text, which I have put in text_expectations.txt and assigned to
myself.  (There was another change which broke ~1700 tests on each platform,
but I put that change behind an #ifdef for now).

R=brettw

Review URL: http://codereview.chromium.org/65012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 67 deletions

diff --git a/skia/include/corecg/SkFDot6.h b/skia/include/corecg/SkFDot6.h
deleted file mode 100644
index a4b9cf7..0000000
--- a/skia/include/corecg/SkFDot6.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SkFDot6_DEFINED
-#define SkFDot6_DEFINED
-
-#include "SkMath.h"
-
-typedef int32_t SkFDot6;
-
-#define SK_FDot61           (64)
-#define SK_FDot6Half        (32)
-
-#ifdef SK_DEBUG
-    inline SkFDot6 SkIntToFDot6(S16CPU x)
-    {
-        SkASSERT(SkToS16(x) == x);
-        return x << 6;
-    }
-#else
-    #define SkIntToFDot6(x) ((x) << 6)
-#endif
-
-#define SkFDot6Floor(x)     ((x) >> 6)
-#define SkFDot6Ceil(x)      (((x) + 63) >> 6)
-#define SkFDot6Round(x)     (((x) + 32) >> 6)
-
-#define SkFixedToFDot6(x)   ((x) >> 10)
-
-inline SkFixed SkFDot6ToFixed(SkFDot6 x)
-{
-    SkASSERT((x << 10 >> 10) == x);
-
-    return x << 10;
-}
-
-#ifdef SK_SCALAR_IS_FLOAT
-    #define SkScalarToFDot6(x)  (SkFDot6)((x) * 64)
-#else
-    #define SkScalarToFDot6(x)  ((x) >> 10)
-#endif
-
-inline SkFixed SkFDot6Div(SkFDot6 a, SkFDot6 b)
-{
-    SkASSERT(b != 0);
-
-    if (a == (int16_t)a)
-        return (a << 16) / b;
-    else
-        return SkFixedDiv(a, b);
-}
-
-#endif
-