From 3723b75614a6af7d941c6db60d8a614dfe914664 Mon Sep 17 00:00:00 2001 From: "apatrick@google.com" Date: Mon, 19 Oct 2009 23:21:19 +0000 Subject: Removed workaround for Chrome 1.0 from o3djs library. Fix big causing Canvas sample to crash. Review URL: http://codereview.chromium.org/303008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29477 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/core/cross/canvas.cc | 2 +- o3d/core/cross/canvas.h | 4 ++-- o3d/core/cross/canvas_paint.cc | 12 ++++++------ o3d/core/cross/canvas_paint.h | 2 +- o3d/core/cross/canvas_shader.cc | 4 ++-- o3d/core/cross/canvas_shader.h | 4 ++-- o3d/core/cross/canvas_utils.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'o3d/core') diff --git a/o3d/core/cross/canvas.cc b/o3d/core/cross/canvas.cc index 7e8f975..07bb4a5 100644 --- a/o3d/core/cross/canvas.cc +++ b/o3d/core/cross/canvas.cc @@ -39,7 +39,7 @@ #include "core/cross/error.h" #include "core/cross/features.h" -#include "third_party/skia/include/core/SkPath.h" +#include "SkPath.h" namespace o3d { diff --git a/o3d/core/cross/canvas.h b/o3d/core/cross/canvas.h index 0c86be9..44691fb 100644 --- a/o3d/core/cross/canvas.h +++ b/o3d/core/cross/canvas.h @@ -41,8 +41,8 @@ #include "core/cross/param.h" #include "core/cross/texture.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "SkBitmap.h" +#include "SkCanvas.h" namespace o3d { diff --git a/o3d/core/cross/canvas_paint.cc b/o3d/core/cross/canvas_paint.cc index fc7e55e..08c5c2e 100644 --- a/o3d/core/cross/canvas_paint.cc +++ b/o3d/core/cross/canvas_paint.cc @@ -36,12 +36,12 @@ #include "core/cross/canvas_utils.h" #include "core/cross/client.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkDrawLooper.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkTypeface.h" -#include "third_party/skia/include/effects/SkBlurDrawLooper.h" +#include "SkCanvas.h" +#include "SkColor.h" +#include "SkDrawLooper.h" +#include "SkPaint.h" +#include "SkTypeface.h" +#include "SkBlurDrawLooper.h" namespace o3d { diff --git a/o3d/core/cross/canvas_paint.h b/o3d/core/cross/canvas_paint.h index aaec72a..8475f93 100644 --- a/o3d/core/cross/canvas_paint.h +++ b/o3d/core/cross/canvas_paint.h @@ -39,7 +39,7 @@ #include "core/cross/param.h" #include "core/cross/canvas_shader.h" -#include "third_party/skia/include/core/SkPaint.h" +#include "SkPaint.h" namespace o3d { diff --git a/o3d/core/cross/canvas_shader.cc b/o3d/core/cross/canvas_shader.cc index a102e28..dc05e5f 100644 --- a/o3d/core/cross/canvas_shader.cc +++ b/o3d/core/cross/canvas_shader.cc @@ -37,8 +37,8 @@ #include "core/cross/canvas_utils.h" #include "core/cross/error.h" -#include "third_party/skia/include/core/SkShader.h" -#include "third_party/skia/include/effects/SkGradientShader.h" +#include "SkShader.h" +#include "SkGradientShader.h" namespace o3d { diff --git a/o3d/core/cross/canvas_shader.h b/o3d/core/cross/canvas_shader.h index cf9fd0b..fbc689e 100644 --- a/o3d/core/cross/canvas_shader.h +++ b/o3d/core/cross/canvas_shader.h @@ -40,8 +40,8 @@ #include "core/cross/param_object.h" #include "core/cross/param.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkPoint.h" +#include "SkColor.h" +#include "SkPoint.h" class SkShader; diff --git a/o3d/core/cross/canvas_utils.h b/o3d/core/cross/canvas_utils.h index 87ce013..c43d1ea 100644 --- a/o3d/core/cross/canvas_utils.h +++ b/o3d/core/cross/canvas_utils.h @@ -34,7 +34,7 @@ #define O3D_CORE_CROSS_CANVAS_UTILS_H_ #include "core/cross/float_n.h" -#include "third_party/skia/include/core/SkColor.h" +#include "SkColor.h" // Helper function to convert from Float4 to an SkColor static SkColor Float4ToSkColor(const o3d::Float4& color) { -- cgit v1.1