update includes for android for gl backend
git-svn-id: http://skia.googlecode.com/svn/trunk@194 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleGL.cpp b/samplecode/SampleGL.cpp
deleted file mode 100644
index d020b0e..0000000
--- a/samplecode/SampleGL.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "SampleCode.h"
-#include "SkView.h"
-#include "SkCanvas.h"
-#include "Sk64.h"
-#include "SkGradientShader.h"
-#include "SkGraphics.h"
-#include "SkImageDecoder.h"
-#include "SkKernel33MaskFilter.h"
-#include "SkPath.h"
-#include "SkRandom.h"
-#include "SkRegion.h"
-#include "SkShader.h"
-#include "SkUtils.h"
-#include "SkColorPriv.h"
-#include "SkColorFilter.h"
-#include "SkTime.h"
-#include "SkTypeface.h"
-#include "SkXfermode.h"
-
-// effects
-#include "SkGradientShader.h"
-#include "SkShaderExtras.h"
-#include "SkUnitMappers.h"
-
-#include "SkStream.h"
-#include "SkXMLParser.h"
-
-#include "SkGLCanvas.h"
-
-#include <AGL/agl.h>
-#include <OpenGL/gl.h>
-
-extern void* gSampleWind;
-
-static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h)
-{
- bm->setConfig(config, w, h);
- bm->allocPixels();
- bm->eraseColor(0);
-
- SkCanvas canvas(*bm);
- SkPoint pts[] = { 0, 0, SkIntToScalar(w), SkIntToScalar(h) };
- SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
- SkScalar pos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
- SkPaint paint;
-
- SkUnitMapper* um = NULL;
-
-// um = new SkCosineMapper;
- // um = new SkDiscreteMapper(12);
-
- SkAutoUnref au(um);
-
- paint.setAntiAlias(true);
- paint.setShader(SkGradientShader::CreateLinear(pts, colors, pos,
- SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode, um))->unref();
-
- SkRect r;
- r.set(0, 0, SkIntToScalar(w), SkIntToScalar(h));
- canvas.drawOval(r, paint);
-}
-
-static void premulBitmap(const SkBitmap& bm) {
- for (int y = 0; y < bm.height(); y++) {
- SkPMColor* p = bm.getAddr32(0, y);
- for (int x = 0; x < bm.width(); x++) {
- SkPMColor c = *p;
- unsigned a = SkGetPackedA32(c);
- unsigned r = SkGetPackedR32(c);
- unsigned g = SkGetPackedG32(c);
- unsigned b = SkGetPackedB32(c);
-
- unsigned scale = SkAlpha255To256(a);
- r = SkAlphaMul(r, scale);
- g = SkAlphaMul(g, scale);
- b = SkAlphaMul(b, scale);
- *p++ = SkPackARGB32(a, r, g, b);
- }
- }
-}
-
-class GLView : public SkView {
-public:
- AGLContext fCtx;
- SkBitmap fOffscreen;
- SkBitmap fTexture[3];
-
- GLView() {
- makebm(&fTexture[0], SkBitmap::kARGB_8888_Config, 64, 100);
- makebm(&fTexture[1], SkBitmap::kRGB_565_Config, 64, 100);
- makebm(&fTexture[2], SkBitmap::kARGB_4444_Config, 64, 100);
-
- GLint major, minor;
-
- aglGetVersion(&major, &minor);
- SkDebugf("---- version %d %d\n", major, minor);
-
- GLint attr[] = {
- AGL_RGBA,
- AGL_DEPTH_SIZE, 32,
- AGL_OFFSCREEN,
- AGL_NONE
- };
-
- SkDebugf("------ attr %p %d\n", attr, sizeof(attr));
- AGLPixelFormat format = aglCreatePixelFormat(attr);
- SkDebugf("----- format %p\n", format);
- fCtx = aglCreateContext(format, 0);
- SkDebugf("----- context %p\n", fCtx);
- GLboolean success; //= aglSetWindowRef(fCtx, (WindowRef)gSampleWind);
-// SkDebugf("----- aglSetWindowRef %d\n", success);
-
- aglEnable(fCtx, GL_BLEND);
- aglEnable(fCtx, GL_LINE_SMOOTH);
- aglEnable(fCtx, GL_POINT_SMOOTH);
- aglEnable(fCtx, GL_POLYGON_SMOOTH);
-
- fOffscreen.setConfig(SkBitmap::kARGB_8888_Config, 300, 300);
- fOffscreen.allocPixels();
-
- success = aglSetOffScreen(fCtx,
- fOffscreen.width(),
- fOffscreen.height(),
- fOffscreen.rowBytes(),
- fOffscreen.getPixels());
- GLenum err = aglGetError();
- SkDebugf("---- setoffscreen %d %d %s\n", success, err, aglErrorString(err));
-
- aglSetCurrentContext(fCtx);
- glOrtho(0, fOffscreen.width(),
- fOffscreen.height(), 0,
- -1, 1);
-
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
-
- glEnable(GL_TEXTURE_2D);
-}
-
-protected:
- // overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "GL");
- return true;
- }
- return this->INHERITED::onQuery(evt);
- }
-
- void drawBG(SkCanvas* canvas) {
- canvas->drawColor(0xFFDDDDDD);
- }
-
- virtual void onDraw(SkCanvas* canvas) {
- this->drawBG(canvas);
-
- SkGLCanvas c(fOffscreen.width(), fOffscreen.height());
-
- glClearColor(0, 0, 0, 0);
- glClear(GL_COLOR_BUFFER_BIT);
-
- SkPaint p;
-
- p.setAntiAlias(true);
-
- c.drawColor(SK_ColorWHITE);
-
- p.setColor(SK_ColorRED);
- c.drawCircle(SkIntToScalar(40), SkIntToScalar(40), SkIntToScalar(20), p);
-
- p.setColor(SK_ColorGREEN);
- p.setStrokeWidth(SkIntToScalar(6));
- p.setStrokeCap(SkPaint::kRound_Cap);
- c.drawLine(SkIntToScalar(10), SkIntToScalar(10), SkIntToScalar(40), SkIntToScalar(50), p);
-
- // c.scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
- p.setColor(0x880000FF);
- c.drawCircle(SkIntToScalar(40), SkIntToScalar(40), SkIntToScalar(20), p);
-
- for (int i = 0; i < SK_ARRAY_COUNT(fTexture); i++) {
- c.drawBitmap(fTexture[i], SkIntToScalar(10), SkIntToScalar(100), NULL);
- c.translate(SkIntToScalar(fTexture[i].width()), 0);
- }
- p.setColor(SK_ColorBLUE);
- c.drawRectCoords(SkIntToScalar(10), SkIntToScalar(100),
- SkIntToScalar(10+fTexture[0].width()),
- SkIntToScalar(100+fTexture[0].height()),
- p);
-
- ////////
- glFlush();
- premulBitmap(fOffscreen);
- canvas->drawBitmap(fOffscreen, SkIntToScalar(10), SkIntToScalar(10), NULL);
- }
-
-private:
-
- typedef SkView INHERITED;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-static SkView* MyFactory() { return new GLView; }
-static SkViewRegister reg(MyFactory);
-
diff --git a/src/gl/SkGL.h b/src/gl/SkGL.h
index 86b8f22..8c8c6899 100644
--- a/src/gl/SkGL.h
+++ b/src/gl/SkGL.h
@@ -10,6 +10,7 @@
#elif defined(ANDROID)
#include <GLES/gl.h>
#include <EGL/egl.h>
+ #include <GLES/glext.h>
#endif
#include "SkColor.h"
diff --git a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
index 49152fa..c55cbc8 100644
--- a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
+++ b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
@@ -70,6 +70,8 @@
009490320FB0A5B90063C792 /* SampleLayerMask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009490310FB0A5B90063C792 /* SampleLayerMask.cpp */; };
009CC9190F65918A002185BE /* SampleFontScalerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009CC9180F65918A002185BE /* SampleFontScalerTest.cpp */; };
00A41E4B0EFC312F00C9CBEB /* SampleArc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */; };
+ 00A728270FD43D0400D5051F /* SampleMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2762F6760FCCCB01002BD8B4 /* SampleMovie.cpp */; };
+ 00A7282F0FD43D3700D5051F /* SkMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A7282D0FD43D3700D5051F /* SkMovie.cpp */; };
00C55DA10F8552DC000CAC09 /* SampleGradients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00C55DA00F8552DC000CAC09 /* SampleGradients.cpp */; };
00FF39140FC6ED2C00915187 /* SampleEffects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00FF39130FC6ED2C00915187 /* SampleEffects.cpp */; };
0156F80407C56A3000C6122B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0156F80307C56A3000C6122B /* Foundation.framework */; };
@@ -194,6 +196,8 @@
009490310FB0A5B90063C792 /* SampleLayerMask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleLayerMask.cpp; path = ../../samplecode/SampleLayerMask.cpp; sourceTree = SOURCE_ROOT; };
009CC9180F65918A002185BE /* SampleFontScalerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFontScalerTest.cpp; path = ../../samplecode/SampleFontScalerTest.cpp; sourceTree = SOURCE_ROOT; };
00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleArc.cpp; path = ../../samplecode/SampleArc.cpp; sourceTree = SOURCE_ROOT; };
+ 00A7282D0FD43D3700D5051F /* SkMovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMovie.cpp; path = ../../src/images/SkMovie.cpp; sourceTree = SOURCE_ROOT; };
+ 00A7282E0FD43D3700D5051F /* SkMovie_gif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMovie_gif.cpp; path = ../../src/images/SkMovie_gif.cpp; sourceTree = SOURCE_ROOT; };
00C55DA00F8552DC000CAC09 /* SampleGradients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleGradients.cpp; path = ../../samplecode/SampleGradients.cpp; sourceTree = SOURCE_ROOT; };
00D6B5CB0F72DC4300C466B9 /* SampleFuzz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFuzz.cpp; path = ../../samplecode/SampleFuzz.cpp; sourceTree = SOURCE_ROOT; };
00FF39130FC6ED2C00915187 /* SampleEffects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleEffects.cpp; path = ../../samplecode/SampleEffects.cpp; sourceTree = SOURCE_ROOT; };
@@ -205,7 +209,6 @@
2762F66B0FCCCABE002BD8B4 /* SkFlipPixelRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkFlipPixelRef.cpp; path = ../../src/images/SkFlipPixelRef.cpp; sourceTree = SOURCE_ROOT; };
2762F66C0FCCCABE002BD8B4 /* SkPageFlipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkPageFlipper.cpp; path = ../../src/images/SkPageFlipper.cpp; sourceTree = SOURCE_ROOT; };
2762F6740FCCCB01002BD8B4 /* SampleAll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleAll.cpp; path = ../../samplecode/SampleAll.cpp; sourceTree = SOURCE_ROOT; };
- 2762F6750FCCCB01002BD8B4 /* SampleGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleGL.cpp; path = ../../samplecode/SampleGL.cpp; sourceTree = SOURCE_ROOT; };
2762F6760FCCCB01002BD8B4 /* SampleMovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleMovie.cpp; path = ../../samplecode/SampleMovie.cpp; sourceTree = SOURCE_ROOT; };
2762F6770FCCCB01002BD8B4 /* SamplePageFlip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplePageFlip.cpp; path = ../../samplecode/SamplePageFlip.cpp; sourceTree = SOURCE_ROOT; };
2762F6780FCCCB01002BD8B4 /* SamplePolyToPoly.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplePolyToPoly.cpp; path = ../../samplecode/SamplePolyToPoly.cpp; sourceTree = SOURCE_ROOT; };
@@ -238,7 +241,6 @@
isa = PBXGroup;
children = (
2762F6740FCCCB01002BD8B4 /* SampleAll.cpp */,
- 2762F6750FCCCB01002BD8B4 /* SampleGL.cpp */,
2762F6760FCCCB01002BD8B4 /* SampleMovie.cpp */,
2762F6770FCCCB01002BD8B4 /* SamplePageFlip.cpp */,
2762F6780FCCCB01002BD8B4 /* SamplePolyToPoly.cpp */,
@@ -296,6 +298,7 @@
00003C6A0EFC22AD000FF73A /* views */ = {
isa = PBXGroup;
children = (
+ 00003CA30EFC235F000FF73A /* SkXMLParser_empty.cpp */,
00003C9A0EFC233F000FF73A /* SkDOM.cpp */,
00003C9B0EFC233F000FF73A /* SkParse.cpp */,
00003C9C0EFC233F000FF73A /* SkParseColor.cpp */,
@@ -350,7 +353,6 @@
isa = PBXGroup;
children = (
2762F66A0FCCCAA2002BD8B4 /* images */,
- 00003CA30EFC235F000FF73A /* SkXMLParser_empty.cpp */,
00003C6A0EFC22AD000FF73A /* views */,
00003C610EFC2287000FF73A /* samples */,
20286C2AFDCF999611CA2CEA /* Sources */,
@@ -398,6 +400,8 @@
2762F66A0FCCCAA2002BD8B4 /* images */ = {
isa = PBXGroup;
children = (
+ 00A7282D0FD43D3700D5051F /* SkMovie.cpp */,
+ 00A7282E0FD43D3700D5051F /* SkMovie_gif.cpp */,
2762F66B0FCCCABE002BD8B4 /* SkFlipPixelRef.cpp */,
2762F66C0FCCCABE002BD8B4 /* SkPageFlipper.cpp */,
0041CDF90F009F0700695E8C /* SkImageRefPool.cpp */,
@@ -569,6 +573,8 @@
2762F66E0FCCCABE002BD8B4 /* SkPageFlipper.cpp in Sources */,
2762F67D0FCCCB01002BD8B4 /* SamplePageFlip.cpp in Sources */,
2762F6800FCCCB07002BD8B4 /* SampleAll.cpp in Sources */,
+ 00A728270FD43D0400D5051F /* SampleMovie.cpp in Sources */,
+ 00A7282F0FD43D3700D5051F /* SkMovie.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/xcode/sampleapp_sdl/SDLApp.xcodeproj/project.pbxproj b/xcode/sampleapp_sdl/SDLApp.xcodeproj/project.pbxproj
index 4779784..34d2770 100644
--- a/xcode/sampleapp_sdl/SDLApp.xcodeproj/project.pbxproj
+++ b/xcode/sampleapp_sdl/SDLApp.xcodeproj/project.pbxproj
@@ -73,6 +73,8 @@
006DC7EA0FC7475D00BF5F45 /* libeffects.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 006DC7D90FC7475400BF5F45 /* libeffects.a */; };
006DC7EB0FC7475E00BF5F45 /* libmaccore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 006DC7E10FC7475700BF5F45 /* libmaccore.a */; };
006DC7EC0FC7475F00BF5F45 /* libcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 006DC7E90FC7475900BF5F45 /* libcore.a */; };
+ 00A728490FD43E7600D5051F /* SampleMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0064EE0C0FC72BEE00D71FB0 /* SampleMovie.cpp */; };
+ 00A7284D0FD43E8900D5051F /* SkMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A7284B0FD43E8900D5051F /* SkMovie.cpp */; };
2762F6040FCCC832002BD8B4 /* SampleShapes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0064EE190FC72BEE00D71FB0 /* SampleShapes.cpp */; };
2762F6420FCCCA6C002BD8B4 /* SkFlipPixelRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2762F6400FCCCA6C002BD8B4 /* SkFlipPixelRef.cpp */; };
2762F6430FCCCA6C002BD8B4 /* SkPageFlipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2762F6410FCCCA6C002BD8B4 /* SkPageFlipper.cpp */; };
@@ -155,7 +157,6 @@
0064EE000FC72BEE00D71FB0 /* SampleFontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFontCache.cpp; path = ../../samplecode/SampleFontCache.cpp; sourceTree = SOURCE_ROOT; };
0064EE010FC72BEE00D71FB0 /* SampleFontScalerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFontScalerTest.cpp; path = ../../samplecode/SampleFontScalerTest.cpp; sourceTree = SOURCE_ROOT; };
0064EE020FC72BEE00D71FB0 /* SampleFuzz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFuzz.cpp; path = ../../samplecode/SampleFuzz.cpp; sourceTree = SOURCE_ROOT; };
- 0064EE030FC72BEE00D71FB0 /* SampleGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleGL.cpp; path = ../../samplecode/SampleGL.cpp; sourceTree = SOURCE_ROOT; };
0064EE040FC72BEE00D71FB0 /* SampleGradients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleGradients.cpp; path = ../../samplecode/SampleGradients.cpp; sourceTree = SOURCE_ROOT; };
0064EE050FC72BEE00D71FB0 /* SampleHairline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleHairline.cpp; path = ../../samplecode/SampleHairline.cpp; sourceTree = SOURCE_ROOT; };
0064EE060FC72BEE00D71FB0 /* SampleImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleImage.cpp; path = ../../samplecode/SampleImage.cpp; sourceTree = SOURCE_ROOT; };
@@ -210,6 +211,8 @@
0064EFA50FC7467C00D71FB0 /* skia_sdl_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_sdl_main.cpp; sourceTree = SOURCE_ROOT; };
0096583F0FC71CA700C3AE15 /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../core/core.xcodeproj; sourceTree = SOURCE_ROOT; };
0096585B0FC7201800C3AE15 /* maccore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = maccore.xcodeproj; path = ../maccore/maccore.xcodeproj; sourceTree = SOURCE_ROOT; };
+ 00A7284B0FD43E8900D5051F /* SkMovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMovie.cpp; path = ../../src/images/SkMovie.cpp; sourceTree = SOURCE_ROOT; };
+ 00A7284C0FD43E8900D5051F /* SkMovie_gif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMovie_gif.cpp; path = ../../src/images/SkMovie_gif.cpp; sourceTree = SOURCE_ROOT; };
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
2762F6400FCCCA6C002BD8B4 /* SkFlipPixelRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkFlipPixelRef.cpp; path = ../../src/images/SkFlipPixelRef.cpp; sourceTree = SOURCE_ROOT; };
@@ -266,7 +269,6 @@
0064EE000FC72BEE00D71FB0 /* SampleFontCache.cpp */,
0064EE010FC72BEE00D71FB0 /* SampleFontScalerTest.cpp */,
0064EE020FC72BEE00D71FB0 /* SampleFuzz.cpp */,
- 0064EE030FC72BEE00D71FB0 /* SampleGL.cpp */,
0064EE040FC72BEE00D71FB0 /* SampleGradients.cpp */,
0064EE050FC72BEE00D71FB0 /* SampleHairline.cpp */,
0064EE060FC72BEE00D71FB0 /* SampleImage.cpp */,
@@ -387,6 +389,8 @@
2762F63F0FCCCA45002BD8B4 /* images */ = {
isa = PBXGroup;
children = (
+ 00A7284B0FD43E8900D5051F /* SkMovie.cpp */,
+ 00A7284C0FD43E8900D5051F /* SkMovie_gif.cpp */,
2762F6400FCCCA6C002BD8B4 /* SkFlipPixelRef.cpp */,
2762F6410FCCCA6C002BD8B4 /* SkPageFlipper.cpp */,
0064EE930FC7318500D71FB0 /* SkImageRefPool.cpp */,
@@ -626,6 +630,8 @@
27E1AACB0FD0C87200098FC5 /* SamplePatch.cpp in Sources */,
27E1AAE00FD0C9B500098FC5 /* SampleShaders.cpp in Sources */,
27E1AB2B0FD0D06600098FC5 /* SamplePageFlip.cpp in Sources */,
+ 00A728490FD43E7600D5051F /* SampleMovie.cpp in Sources */,
+ 00A7284D0FD43E8900D5051F /* SkMovie.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};