| Index: ppapi/shared_impl/ppb_image_data_shared.cc
|
| ===================================================================
|
| --- ppapi/shared_impl/ppb_image_data_shared.cc (revision 150367)
|
| +++ ppapi/shared_impl/ppb_image_data_shared.cc (working copy)
|
| @@ -1,21 +1,32 @@
|
| -// 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 "ppapi/shared_impl/ppb_image_data_shared.h"
|
|
|
| +#include "build/build_config.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
|
|
|