Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: ppapi/shared_impl/image_data_impl.cc

Issue 6682011: Build skia as a dll in windows multi-dll build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix lint error. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/ppapi_shared_proxy.gypi ('k') | skia/config/SkUserConfig.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/shared_impl/image_data_impl.h" 5 #include "ppapi/shared_impl/image_data_impl.h"
6 6
7 #include "skia/config/SkUserConfig.h" 7 #include "third_party/skia/include/core/SkTypes.h"
8 8
9 namespace pp { 9 namespace pp {
10 namespace shared_impl { 10 namespace shared_impl {
11 11
12 // static 12 // static
13 PP_ImageDataFormat ImageDataImpl::GetNativeImageDataFormat() { 13 PP_ImageDataFormat ImageDataImpl::GetNativeImageDataFormat() {
14 if (SK_B32_SHIFT == 0) 14 if (SK_B32_SHIFT == 0)
15 return PP_IMAGEDATAFORMAT_BGRA_PREMUL; 15 return PP_IMAGEDATAFORMAT_BGRA_PREMUL;
16 else if (SK_R32_SHIFT == 0) 16 else if (SK_R32_SHIFT == 0)
17 return PP_IMAGEDATAFORMAT_RGBA_PREMUL; 17 return PP_IMAGEDATAFORMAT_RGBA_PREMUL;
18 else 18 else
19 return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure. 19 return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure.
20 } 20 }
21 21
22 // static 22 // static
23 bool ImageDataImpl::IsImageDataFormatSupported(PP_ImageDataFormat format) { 23 bool ImageDataImpl::IsImageDataFormatSupported(PP_ImageDataFormat format) {
24 return format == PP_IMAGEDATAFORMAT_BGRA_PREMUL || 24 return format == PP_IMAGEDATAFORMAT_BGRA_PREMUL ||
25 format == PP_IMAGEDATAFORMAT_RGBA_PREMUL; 25 format == PP_IMAGEDATAFORMAT_RGBA_PREMUL;
26 } 26 }
27 27
28 } // namespace shared_impl 28 } // namespace shared_impl
29 } // namespace pp 29 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/ppapi_shared_proxy.gypi ('k') | skia/config/SkUserConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698