aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gmmain.cpp
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-02 19:07:57 +0000
committerGravatar scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-02 19:07:57 +0000
commitb3c0f4886e22b6d2041c1049a1f295943959fff1 (patch)
treeb1cb5c79ea41e0aa142d33b330733e1f4c56b1d1 /gm/gmmain.cpp
parent126b4362be3bb43ef8f7a10df710b40e8bba869d (diff)
Provide static global initializers for SkColorTable and SkComposeShader.
This makes some GMs which were broken on Android work. Reenable them on Android. Also fix a typo in gmmain. Review URL: https://codereview.appspot.com/6344069 git-svn-id: http://skia.googlecode.com/svn/trunk@4426 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gmmain.cpp')
-rw-r--r--gm/gmmain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index e79831a0ff..b78fb9e8a9 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -628,7 +628,7 @@ struct PipeFlagComboData {
static PipeFlagComboData gPipeWritingFlagCombos[] = {
{ "", 0 },
{ " cross-process", SkGPipeWriter::kCrossProcess_Flag },
- { " cross-process, shared adress", SkGPipeWriter::kCrossProcess_Flag
+ { " cross-process, shared address", SkGPipeWriter::kCrossProcess_Flag
| SkGPipeWriter::kSharedAddressSpace_SkGPipeFlag }
};