Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.

ppapi/shared_impl/ppb_image_data_shared.cc

-// 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"

[brettw, 2012/08/07 20:02:53]

This should go below (The .h always comes first with a blank line after it. If
the .h depends on build_config, it should include it itself).

[bbudge, 2012/08/07 20:07:57]

Done.

 #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
 bool PPB_ImageData_Shared::IsImageDataFormatSupported(
     PP_ImageDataFormat format) {
   return format == PP_IMAGEDATAFORMAT_BGRA_PREMUL ||
          format == PP_IMAGEDATAFORMAT_RGBA_PREMUL;
 }
 
 }  // namespace ppapi