commit da342a891779e0839a645d6634a2f0100bf2c0d6
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 23 18:37:08 2008 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 23 18:37:08 2008 +0000
tree c9751a47cf747a401e9697764f9e6e49a09bad93
parent 0ae6b245f2b79bc04f0801b08fcf05abcf98fd6c

update more sample code to new compose shader header



git-svn-id: http://skia.googlecode.com/svn/trunk@48 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SamplePicture.cpp

diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 48de7df..dfc1555 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -12,7 +12,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SamplePoints.cpp

diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp
index 2c19658..7dc98f3 100644
--- a/samplecode/SamplePoints.cpp
+++ b/samplecode/SamplePoints.cpp
@@ -11,7 +11,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleShaders.cpp

diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 4d82182..f5ddca9 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -10,7 +10,7 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
+#include "SkComposeShader.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleStrokeText.cpp

diff --git a/samplecode/SampleStrokeText.cpp b/samplecode/SampleStrokeText.cpp
index 8b78585..0627d51 100644
--- a/samplecode/SampleStrokeText.cpp
+++ b/samplecode/SampleStrokeText.cpp
@@ -11,7 +11,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleText.cpp

diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 9fc3708..60e015a 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -11,7 +11,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
@@ -96,9 +95,11 @@
     SkTypeface* t2 = SkTypeface::Create("arial", SkTypeface::kNormal);
     SkTypeface* t3 = SkTypeface::Create("helvetica", SkTypeface::kItalic);
     
+#ifndef SK_BUILD_FOR_MAC
     SkASSERT(t0 == t1);
     SkASSERT(t0 == t2);
     SkASSERT(t0 == t3);
+#endif
 }
 
 static void test_breakText()

samplecode/SampleTextAlpha.cpp

diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index f2a6530..d695f23 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -12,7 +12,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleTextEffects.cpp

diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index e335343..2293a04 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -6,7 +6,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTypeface.h"

samplecode/SampleTextOnPath.cpp

diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp
index 382b4d9..97b4e8e 100644
--- a/samplecode/SampleTextOnPath.cpp
+++ b/samplecode/SampleTextOnPath.cpp
@@ -11,7 +11,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTypeface.h"

samplecode/SampleTiling.cpp

diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index 559d9d4..759c17c 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -12,7 +12,6 @@
 
 // effects
 #include "SkGradientShader.h"
-#include "SkShaderExtras.h"
 #include "SkUnitMappers.h"
 #include "SkBlurDrawLooper.h"
 

samplecode/SampleTypeface.cpp

diff --git a/samplecode/SampleTypeface.cpp b/samplecode/SampleTypeface.cpp
index e78c525..94023b7 100644
--- a/samplecode/SampleTypeface.cpp
+++ b/samplecode/SampleTypeface.cpp
@@ -6,7 +6,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "Sk1DPathEffect.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"

samplecode/SampleVertices.cpp

diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 54dada2..637c661 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -11,7 +11,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleXfermodes.cpp

diff --git a/samplecode/SampleXfermodes.cpp b/samplecode/SampleXfermodes.cpp
index 5a05fc8..1dbfc95 100644
--- a/samplecode/SampleXfermodes.cpp
+++ b/samplecode/SampleXfermodes.cpp
@@ -12,7 +12,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"