projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
renderer
/
pepper
/
ppb_image_data_impl.cc
diff --git
a/src/content/renderer/pepper/ppb_image_data_impl.cc
b/src/content/renderer/pepper/ppb_image_data_impl.cc
index
086eee2
..
28f23c9
100644
(file)
--- a/
src/content/renderer/pepper/ppb_image_data_impl.cc
+++ b/
src/content/renderer/pepper/ppb_image_data_impl.cc
@@
-10,7
+10,6
@@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/view_messages.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/view_messages.h"
-#include "content/renderer/pepper/common.h"
#include "content/renderer/render_thread_impl.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/pp_instance.h"
#include "content/renderer/render_thread_impl.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/pp_instance.h"
@@
-259,8
+258,8
@@
bool ImageDataSimpleBackend::Init(PPB_ImageData_Impl* impl,
int width,
int height,
bool init_to_zero) {
int width,
int height,
bool init_to_zero) {
- skia_bitmap_.set
Config
(
- Sk
Bitmap::kARGB_8888_Config, impl->width(), impl->height(
));
+ skia_bitmap_.set
Info
(
+ Sk
ImageInfo::MakeN32Premul(impl->width(), impl->height()
));
shared_memory_.reset(
RenderThread::Get()
->HostAllocateSharedMemoryBuffer(skia_bitmap_.getSize())
shared_memory_.reset(
RenderThread::Get()
->HostAllocateSharedMemoryBuffer(skia_bitmap_.getSize())