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, 47 deletions

diff --git a/skia/include/SkJS.h b/skia/include/SkJS.h
deleted file mode 100644
index fe76352..0000000
--- a/skia/include/SkJS.h
+++ /dev/null
@@ -1,47 +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.
- */
-
-#include "SkTypes.h"
-#include "SkWindow.h"
-
-extern "C" {
-    typedef long JSWord;
-    typedef JSWord jsword;
-    typedef jsword  jsval;
-    typedef struct JSRuntime JSRuntime;
-    typedef struct JSContext JSContext;
-    typedef struct JSObject JSObject;
-}
-
-class SkString;
-
-class SkJS : public SkOSWindow {
-public:
-    SkJS(void* hwnd);
-    ~SkJS();
-    SkBool EvaluateScript(const char* script, jsval* rVal);
-    SkBool ValueToString(jsval value, SkString* string);
-#ifdef SK_DEBUG
-    static void Test(void* hwnd);
-#endif
-protected:
-    void InitializeDisplayables(const SkBitmap& , JSContext *, JSObject *, JSObject *);
-    void DisposeDisplayables();
-    JSRuntime *fRuntime;
-    JSContext *fContext;
-    JSObject *fGlobal;
-};
-