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

20 files changed, 22 insertions, 22 deletions

diff --git a/views/background.cc b/views/background.cc
index f2bd176..37b1251 100644
--- a/views/background.cc
+++ b/views/background.cc
@@ -7,7 +7,7 @@
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
 #include "skia/ext/skia_utils_win.h"
-#include "skia/include/SkPaint.h"
+#include "third_party/skia/include/core/SkPaint.h"
 #include "views/painter.h"
 #include "views/view.h"
 
diff --git a/views/background.h b/views/background.h
index acc3948..efb2a63 100644
--- a/views/background.h
+++ b/views/background.h
@@ -12,7 +12,7 @@
 #endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class ChromeCanvas;
 
diff --git a/views/border.h b/views/border.h
index 7e7e2bd..98086c2 100644
--- a/views/border.h
+++ b/views/border.h
@@ -6,7 +6,7 @@
 #define VIEWS_BORDER_H_
 
 #include "app/gfx/insets.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "views/view.h"
 
 class ChromeCanvas;
diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
index c687561..da2e0a4 100644
--- a/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
 
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/button/custom_button.h"
 
 namespace views {
diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h
index 16bac57..aeb2b72 100644
--- a/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include "app/gfx/chrome_font.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "views/border.h"
 #include "views/controls/button/custom_button.h"
 
diff --git a/views/controls/image_view.h b/views/controls/image_view.h
index b7ac792..ca4e2ea 100644
--- a/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_IMAGE_VIEW_H_
 #define VIEWS_CONTROLS_IMAGE_VIEW_H_
 
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "views/view.h"
 
 class ChromeCanvas;
diff --git a/views/controls/label.h b/views/controls/label.h
index fa620e4..d5f246e 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -7,7 +7,7 @@
 
 #include "app/gfx/chrome_font.h"
 #include "googleurl/src/gurl.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "views/view.h"
 
diff --git a/views/controls/menu/chrome_menu.h b/views/controls/menu/chrome_menu.h
index 02caaed..f19af15 100644
--- a/views/controls/menu/chrome_menu.h
+++ b/views/controls/menu/chrome_menu.h
@@ -14,7 +14,7 @@
 #include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/controller.h"
 #include "views/view.h"
 
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index 4a93782..e484517 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -8,7 +8,7 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "grit/generated_resources.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/tabbed_pane.cc b/views/controls/tabbed_pane.cc
index 401cb79..04b7273 100644
--- a/views/controls/tabbed_pane.cc
+++ b/views/controls/tabbed_pane.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "skia/ext/skia_utils_win.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index bde6bec..5ab86d3 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -15,8 +15,8 @@
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "skia/ext/skia_utils_win.h"
-#include "skia/include/SkBitmap.h"
-#include "skia/include/SkColorFilter.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
 #include "views/controls/hwnd_view.h"
 
 namespace views {
diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h
index 20514c3..2db5234 100644
--- a/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.h
@@ -18,7 +18,7 @@
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 #if defined(OS_WIN)
 // TODO(port): remove the ifdef when native_control.h is ported.
 #include "views/controls/native_control.h"
diff --git a/views/controls/text_field.h b/views/controls/text_field.h
index 3b030ba..3ae3ed4 100644
--- a/views/controls/text_field.h
+++ b/views/controls/text_field.h
@@ -13,7 +13,7 @@
 #include "app/gfx/chrome_font.h"
 #include "base/basictypes.h"
 #include "views/view.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace views {
 
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index d230c55..5f10f1f 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -8,7 +8,7 @@
 #include "app/resource_bundle.h"
 #include "base/time.h"
 #include "grit/theme_resources.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 234db1d..7176a0d 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
diff --git a/views/painter.cc b/views/painter.cc
index a2ad4ee..d44eef8 100644
--- a/views/painter.cc
+++ b/views/painter.cc
@@ -7,8 +7,8 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
-#include "skia/include/SkBitmap.h"
-#include "skia/include/SkGradientShader.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace views {
 
diff --git a/views/painter.h b/views/painter.h
index 83610c3..71d5565 100644
--- a/views/painter.h
+++ b/views/painter.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class ChromeCanvas;
 class SkBitmap;
diff --git a/views/view.cc b/views/view.cc
index 9740fc0..f535c50 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -16,7 +16,7 @@
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
-#include "skia/include/SkShader.h"
+#include "third_party/skia/include/core/SkShader.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
 #include "views/views_delegate.h"
diff --git a/views/widget/root_view_gtk.cc b/views/widget/root_view_gtk.cc
index 231beca..61bb5f5 100644
--- a/views/widget/root_view_gtk.cc
+++ b/views/widget/root_view_gtk.cc
@@ -8,7 +8,7 @@
 
 #include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "skia/include/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace views {
 
diff --git a/views/window/window_delegate.cc b/views/window/window_delegate.cc
index 5442743..ac5816f 100644
--- a/views/window/window_delegate.cc
+++ b/views/window/window_delegate.cc
@@ -6,7 +6,7 @@
 #include "views/views_delegate.h"
 #include "views/window/client_view.h"
 #include "views/window/window.h"
-#include "skia/include/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace views {