Commit | Line | Data |
---|---|---|
28adcc4f VM |
1 | From 1601a9912c33035adf4b23aaff3b8030142c7e93 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com> | |
3 | Date: Sat, 22 Nov 2014 02:14:42 +0100 | |
4 | Subject: [PATCH] Fix build with !USE_SKIA_GPU | |
5 | ||
6 | gfx/2d/SourceSurfaceSkia.cpp | 2 ++ | |
7 | gfx/2d/SourceSurfaceSkia.h | 3 ++- | |
8 | 2 files changed, 4 insertions(+), 1 deletion(-) | |
9 | ||
10 | diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp | |
11 | index 4b95bc2..29ee658 100644 | |
12 | --- a/gfx/2d/SourceSurfaceSkia.cpp | |
13 | +++ b/gfx/2d/SourceSurfaceSkia.cpp | |
14 | @@ -91,6 +91,7 @@ SourceSurfaceSkia::InitFromData(unsigned char* aData, | |
15 | return true; | |
16 | } | |
17 | ||
18 | +#ifdef USE_SKIA_GPU | |
19 | bool | |
20 | SourceSurfaceSkia::InitFromTexture(DrawTargetSkia* aOwner, | |
21 | unsigned int aTexture, | |
22 | @@ -116,6 +117,7 @@ SourceSurfaceSkia::InitFromTexture(DrawTargetSkia* aOwner, | |
23 | mDrawTarget = aOwner; | |
24 | return true; | |
25 | } | |
26 | +#endif | |
27 | ||
28 | unsigned char* | |
29 | SourceSurfaceSkia::GetData() | |
30 | diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h | |
31 | index de57602..d572560 100644 | |
32 | --- a/gfx/2d/SourceSurfaceSkia.h | |
33 | +++ b/gfx/2d/SourceSurfaceSkia.h | |
34 | @@ -41,6 +41,7 @@ public: | |
35 | SurfaceFormat aFormat, | |
36 | DrawTargetSkia* aOwner); | |
37 | ||
38 | +#ifdef USE_SKIA_GPU | |
39 | /** | |
40 | * NOTE: While wrapping a Texture for SkiaGL, the texture *must* be created | |
41 | * with the same GLcontext of DrawTargetSkia | |
42 | @@ -49,7 +50,7 @@ public: | |
43 | unsigned int aTexture, | |
44 | const IntSize &aSize, | |
45 | SurfaceFormat aFormat); | |
46 | - | |
47 | +#endif | |
48 | virtual unsigned char *GetData(); | |
49 | ||
50 | virtual int32_t Stride() { return mStride; } |