am eceb317: am f4afc40: Merge "framework: fix bug for uninitialized variable"

raphlinus · Android Git Automerger · commit e590568417aa · 2012-09-14T12:16:32.000-07:00
* commit 'eceb317116d87dada85d06df8fe0e07dd4aec49d':
  framework: fix bug for uninitialized variable
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
@@ -750,7 +750,7 @@ class SkPaintGlue {
     static void doTextBounds(JNIEnv* env, const jchar* text, int count,
                              jobject bounds, const SkPaint& paint)
     {
-        SkRect  r;
+        SkRect  r{0,0,0,0};
         SkIRect ir;
 
         sp<TextLayoutValue> value = TextLayoutEngine::getInstance().getValue(&paint,

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ class SkPaintGlue {`
`750`	`750`	`static void doTextBounds(JNIEnv* env, const jchar* text, int count,`
`751`	`751`	`jobject bounds, const SkPaint& paint)`
`752`	`752`	`{`
`753`		`- SkRect r;`
	`753`	`+ SkRect r{0,0,0,0};`
`754`	`754`	`SkIRect ir;`
`755`	`755`
`756`	`756`	`sp<TextLayoutValue> value = TextLayoutEngine::getInstance().getValue(&paint,`