diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 14:53:32 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 14:53:32 +0000 |
| commit | ab6ce194c68e78f474ec39cdae6cb941fa9eb237 (patch) | |
| tree | c75f5aaec3d8f4e99592b3614fb9db9f85669356 /ppapi/shared_impl | |
| parent | f5da7dc925e30fd5b28877ae74f134058bb0eff7 (diff) | |
| download | chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.zip chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.tar.gz chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.tar.bz2 | |
Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.
BUG=116317
TEST=builds,manual
With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
| -rw-r--r-- | ppapi/shared_impl/ppb_image_data_shared.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ppapi/shared_impl/ppb_image_data_shared.cc b/ppapi/shared_impl/ppb_image_data_shared.cc index b0935e4..2a253e0 100644 --- a/ppapi/shared_impl/ppb_image_data_shared.cc +++ b/ppapi/shared_impl/ppb_image_data_shared.cc @@ -1,21 +1,31 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "ppapi/shared_impl/ppb_image_data_shared.h" +#if !defined(OS_NACL) #include "third_party/skia/include/core/SkTypes.h" +#endif namespace ppapi { // static PP_ImageDataFormat PPB_ImageData_Shared::GetNativeImageDataFormat() { +#if !defined(OS_NACL) if (SK_B32_SHIFT == 0) return PP_IMAGEDATAFORMAT_BGRA_PREMUL; else if (SK_R32_SHIFT == 0) return PP_IMAGEDATAFORMAT_RGBA_PREMUL; else return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure. +#else + // In NaCl, just default to something. If we're wrong, it will be converted + // later. + // TODO(dmichael): Really proxy this. + return PP_IMAGEDATAFORMAT_BGRA_PREMUL; +#endif } // static |