Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #ifndef PPAPI_CPP_IMAGE_DATA_H_ | 5 #ifndef PPAPI_CPP_IMAGE_DATA_H_ |
| 6 #define PPAPI_CPP_IMAGE_DATA_H_ | 6 #define PPAPI_CPP_IMAGE_DATA_H_ |
| 7 | 7 |
| 8 #include "ppapi/c/ppb_image_data.h" | 8 #include "ppapi/c/ppb_image_data.h" |
| 9 #include "ppapi/cpp/point.h" | 9 #include "ppapi/cpp/point.h" |
| 10 #include "ppapi/cpp/size.h" | 10 #include "ppapi/cpp/size.h" |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 /// | 41 /// |
| 42 /// @param[in] other A pointer to an image data. | 42 /// @param[in] other A pointer to an image data. |
| 43 ImageData(const ImageData& other); | 43 ImageData(const ImageData& other); |
| 44 | 44 |
| 45 /// A constructor that allocates a new <code>ImageData</code> in the browser | 45 /// A constructor that allocates a new <code>ImageData</code> in the browser |
| 46 /// with the provided parameters. The resulting object will be is_null() if | 46 /// with the provided parameters. The resulting object will be is_null() if |
| 47 /// the allocation failed. | 47 /// the allocation failed. |
| 48 /// | 48 /// |
| 49 /// @param[in] instance A <code>PP_Instance</code> indentifying one instance | 49 /// @param[in] instance A <code>PP_Instance</code> indentifying one instance |
| 50 /// of a module. | 50 /// of a module. |
| 51 /// | |
|
dmichael (off chromium)
2011/08/12 20:17:59
I thought brettw asked you in some other CL to add
jond
2011/08/12 20:50:59
Yes, in fact, I shouldn't have changed this...
On
| |
| 52 /// @param[in] format A PP_ImageDataFormat containing desired image format. | 51 /// @param[in] format A PP_ImageDataFormat containing desired image format. |
| 53 /// PP_ImageDataFormat is an enumeration of the different types of | 52 /// PP_ImageDataFormat is an enumeration of the different types of |
| 54 /// image data formats. Refer to the | 53 /// image data formats. Refer to the |
| 55 /// <a href="/chrome/nativeclient/docs/reference/pepperc/ | 54 /// <a href="/chrome/nativeclient/docs/reference/pepperc/ |
| 56 /// ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further | 55 /// ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further |
| 57 /// information. | 56 /// information. |
| 58 /// | |
| 59 /// @param[in] size A pointer to a <code>Size</code> containing the image | 57 /// @param[in] size A pointer to a <code>Size</code> containing the image |
| 60 /// size. | 58 /// size. |
| 61 /// | |
| 62 /// @param[in] init_to_zero A bool used to determine transparency at | 59 /// @param[in] init_to_zero A bool used to determine transparency at |
| 63 /// creation. Set the <code>init_to_zero</code> flag if you want the bitmap | 60 /// creation. Set the <code>init_to_zero</code> flag if you want the bitmap |
| 64 /// initialized to transparent during the creation process. If this flag is | 61 /// initialized to transparent during the creation process. If this flag is |
| 65 /// not set, the current contents of the bitmap will be undefined, and the | 62 /// not set, the current contents of the bitmap will be undefined, and the |
| 66 /// module should be sure to set all the pixels. | 63 /// module should be sure to set all the pixels. |
| 67 ImageData(Instance* instance, | 64 ImageData(Instance* instance, |
| 68 PP_ImageDataFormat format, | 65 PP_ImageDataFormat format, |
| 69 const Size& size, | 66 const Size& size, |
| 70 bool init_to_zero); | 67 bool init_to_zero); |
| 71 | 68 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 127 private: | 124 private: |
| 128 void PassRefAndInitData(PP_Resource resource); | 125 void PassRefAndInitData(PP_Resource resource); |
| 129 | 126 |
| 130 PP_ImageDataDesc desc_; | 127 PP_ImageDataDesc desc_; |
| 131 void* data_; | 128 void* data_; |
| 132 }; | 129 }; |
| 133 | 130 |
| 134 } // namespace pp | 131 } // namespace pp |
| 135 | 132 |
| 136 #endif // PPAPI_CPP_IMAGE_DATA_H_ | 133 #endif // PPAPI_CPP_IMAGE_DATA_H_ |
| OLD | NEW |