diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 08:16:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-18 08:16:35 +0000 |
| commit | e33706291432ea823c6749805e03e48781582083 (patch) | |
| tree | 29ff0030280e2108f4f80dfd76984d79df628bac /ppapi/proxy/ppb_image_data_proxy.h | |
| parent | ffadb717d9ab2138fde9dc238ad697449da4d75e (diff) | |
| download | chromium_src-e33706291432ea823c6749805e03e48781582083.zip chromium_src-e33706291432ea823c6749805e03e48781582083.tar.gz chromium_src-e33706291432ea823c6749805e03e48781582083.tar.bz2 | |
Ifdef out skia code that won't compile on nacl.
This #ifdefs out the Skia-specific code in the ImageData proxy when compiling
under NaCl. I did not actually write the code to replace it (which should be
quite simple) because we can't test it yet.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9355026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_image_data_proxy.h')
| -rw-r--r-- | ppapi/proxy/ppb_image_data_proxy.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h index 00fec80..a37445c 100644 --- a/ppapi/proxy/ppb_image_data_proxy.h +++ b/ppapi/proxy/ppb_image_data_proxy.h @@ -6,6 +6,7 @@ #define PPAPI_PPB_IMAGE_DATA_PROXY_H_ #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" @@ -22,14 +23,7 @@ class TransportDIB; -namespace skia { -class PlatformCanvas; -} - namespace ppapi { - -class HostResource; - namespace proxy { // The proxied image data resource. Unlike most resources, this needs to be @@ -61,10 +55,14 @@ class ImageData : public ppapi::Resource, private: PP_ImageDataDesc desc_; +#if defined(OS_NACL) + // TODO(brettw) implement this (see .cc file). +#else scoped_ptr<TransportDIB> transport_dib_; // Null when the image isn't mapped. scoped_ptr<skia::PlatformCanvas> mapped_canvas_; +#endif DISALLOW_COPY_AND_ASSIGN(ImageData); }; |