commit b636adf980c03013d5d97f49e6d2b456df9ea43f
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 06 19:34:13 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 06 19:34:13 2011 +0000
tree 9a44abfb21273c29275592a32ce3d8255ae10079
parent b67052596f8abebbbc6399c682b20a7dffeeecef

reimage ninepatch-stretch with white bg (for easier printing)



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

gm/ninepatchstretch.cpp

diff --git a/gm/ninepatchstretch.cpp b/gm/ninepatchstretch.cpp
index dfe0b7c..02cfcab 100644
--- a/gm/ninepatchstretch.cpp
+++ b/gm/ninepatchstretch.cpp
@@ -75,7 +75,7 @@
     }
     
     virtual void onDraw(SkCanvas* canvas) {
-        canvas->drawColor(SK_ColorBLACK);
+        canvas->drawColor(SK_ColorWHITE);
 
         SkBitmap bm;
         SkIRect center;

samplecode/SampleBitmapRect.cpp

diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 16f9ba7..95ea1a7 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -66,7 +66,7 @@
     }
     
     virtual void onDrawContent(SkCanvas* canvas) {
-        GrContext* ctx = NULL;//SampleCode::GetGr();
+        GrContext* ctx = SampleCode::GetGr();
 
         const SkIRect src[] = {
             { 0, 0, 32, 32 },

samplecode/SampleNinePatch.cpp

diff --git a/samplecode/SampleNinePatch.cpp b/samplecode/SampleNinePatch.cpp
index 7dcbbce..f62a58c 100644
--- a/samplecode/SampleNinePatch.cpp
+++ b/samplecode/SampleNinePatch.cpp
@@ -6,12 +6,9 @@
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
-#include "SkView.h"
 #include "SkCanvas.h"
-#include "SkImageDecoder.h"
 #include "SkNinePatch.h"
 #include "SkPaint.h"
-#include "SkUnPreMultiply.h"
 #include "SkGpuDevice.h"
 
 static void make_bitmap(SkBitmap* bitmap, GrContext* ctx, SkIRect* center) {
@@ -43,16 +40,6 @@
     SkPaint paint;
     paint.setAntiAlias(true);
 
-#if 0
-    r.inset(strokeWidth/2, strokeWidth/2);
-
-    paint.setColor(SK_ColorBLUE);
-    canvas.drawRoundRect(r, radius, radius, paint);
-    paint.setColor(SK_ColorRED);
-    paint.setStyle(SkPaint::kStroke_Style);
-    paint.setStrokeWidth(strokeWidth);
-    canvas.drawRoundRect(r, radius, radius, paint);
-#else
     paint.setColor(0xFFFF0000);
     canvas.drawRoundRect(r, radius, radius, paint);
     r.setXYWH(SkIntToScalar(kFixed), 0, SkIntToScalar(kStretchy), SkIntToScalar(kSize));
@@ -61,7 +48,6 @@
     r.setXYWH(0, SkIntToScalar(kFixed), SkIntToScalar(kSize), SkIntToScalar(kStretchy));
     paint.setColor(0x880000FF);
     canvas.drawRect(r, paint);
-#endif
 }