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

9 files changed, 15 insertions, 14 deletions

diff --git a/app/gfx/chrome_canvas.cc b/app/gfx/chrome_canvas.cc
index dfb1936..9898168 100644
--- a/app/gfx/chrome_canvas.cc
+++ b/app/gfx/chrome_canvas.cc
@@ -10,7 +10,7 @@
 #include "app/l10n_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "skia/include/SkShader.h"
+#include "third_party/skia/include/core/SkShader.h"
 
 bool ChromeCanvas::GetClipRect(gfx::Rect* r) {
   SkRect clip;
diff --git a/app/gfx/chrome_canvas_win.cc b/app/gfx/chrome_canvas_win.cc
index 76ca4d7..e1d2da85a 100644
--- a/app/gfx/chrome_canvas_win.cc
+++ b/app/gfx/chrome_canvas_win.cc
@@ -9,7 +9,7 @@
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
 #include "base/gfx/rect.h"
-#include "skia/include/SkShader.h"
+#include "third_party/skia/include/core/SkShader.h"
 
 namespace {
 
diff --git a/app/gfx/chrome_font.h b/app/gfx/chrome_font.h
index 3672593..e0479f4 100644
--- a/app/gfx/chrome_font.h
+++ b/app/gfx/chrome_font.h
@@ -12,7 +12,7 @@
 #if defined(OS_WIN)
 typedef struct HFONT__* HFONT;
 #elif defined(OS_LINUX)
-#include "skia/include/SkRefCnt.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 class SkPaint;
 class SkTypeface;
 #endif
diff --git a/app/gfx/chrome_font_skia.cc b/app/gfx/chrome_font_skia.cc
index 87f4ad6..6c1b6d5 100644
--- a/app/gfx/chrome_font_skia.cc
+++ b/app/gfx/chrome_font_skia.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 
-#include "skia/include/SkTypeface.h"
-#include "skia/include/SkPaint.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "third_party/skia/include/core/SkPaint.h"
 
 ChromeFont::ChromeFont(const ChromeFont& other) {
   CopyChromeFont(other);
@@ -80,8 +80,8 @@ ChromeFont ChromeFont::CreateFont(const std::wstring& font_family,
                                   int font_size) {
   DCHECK_GT(font_size, 0);
 
-  SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_family).c_str(),
-                                      SkTypeface::kNormal);
+  SkTypeface* tf = SkTypeface::CreateFromName(
+      base::SysWideToUTF8(font_family).c_str(), SkTypeface::kNormal);
   DCHECK(tf) << "Could not find font: " << base::SysWideToUTF8(font_family);
   SkAutoUnref tf_helper(tf);
 
@@ -106,8 +106,9 @@ ChromeFont ChromeFont::DeriveFont(int size_delta, int style) const {
   if (ITALIC & style)
     skstyle |= SkTypeface::kItalic;
 
-  SkTypeface* tf = SkTypeface::Create(base::SysWideToUTF8(font_family_).c_str(),
-                                      static_cast<SkTypeface::Style>(skstyle));
+  SkTypeface* tf = SkTypeface::CreateFromName(
+      base::SysWideToUTF8(font_family_).c_str(),
+      static_cast<SkTypeface::Style>(skstyle));
   SkAutoUnref tf_helper(tf);
 
   return ChromeFont(tf, font_family_, font_size_ + size_delta, skstyle);
diff --git a/app/gfx/color_utils.cc b/app/gfx/color_utils.cc
index 6378723..70ef31c 100644
--- a/app/gfx/color_utils.cc
+++ b/app/gfx/color_utils.cc
@@ -15,7 +15,7 @@
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
 #endif
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace color_utils {
 
diff --git a/app/gfx/color_utils.h b/app/gfx/color_utils.h
index 706361d..9fb9cd4 100644
--- a/app/gfx/color_utils.h
+++ b/app/gfx/color_utils.h
@@ -5,7 +5,7 @@
 #ifndef APP_GFX_COLOR_UTILS_H_
 #define APP_GFX_COLOR_UTILS_H_
 
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class SkBitmap;
 
diff --git a/app/gfx/icon_util.cc b/app/gfx/icon_util.cc
index 5efa8e4..42c0c38 100644
--- a/app/gfx/icon_util.cc
+++ b/app/gfx/icon_util.cc
@@ -9,7 +9,7 @@
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "skia/ext/image_operations.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 // Defining the dimensions for the icon images. We store only one value because
 // we always resize to a square image; that is, the value 48 means that we are
diff --git a/app/gfx/icon_util_unittest.cc b/app/gfx/icon_util_unittest.cc
index 577489c..ed65ca52 100644
--- a/app/gfx/icon_util_unittest.cc
+++ b/app/gfx/icon_util_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/app/theme_provider.h b/app/theme_provider.h
index ebc94c6..7257886 100644
--- a/app/theme_provider.h
+++ b/app/theme_provider.h
@@ -5,7 +5,7 @@
 #ifndef APP_THEME_PROVIDER_H_
 #define APP_THEME_PROVIDER_H_
 
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class SkBitmap;