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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp

Issue 1407393002: ImageBitmap: Change two enum uses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 28 matching lines...) Expand all
39 namespace blink { 39 namespace blink {
40 40
41 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode, ImageInitializationMode initializationMode) 41 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode, ImageInitializationMode initializationMode)
42 : ImageBufferSurface(size, opacityMode) 42 : ImageBufferSurface(size, opacityMode)
43 { 43 {
44 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType; 44 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType;
45 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe); 45 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe);
46 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry); 46 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
47 m_surface = adoptRef(SkSurface::NewRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps)); 47 m_surface = adoptRef(SkSurface::NewRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps));
48 48
49 if (initializationMode == DoNotInitializeImagePixels) { 49 if (initializationMode == InitializeImagePixels) {
xidachen 2015/10/18 14:08:48 Correct. Thank you for catching this. I believe th
50 if (m_surface) 50 if (m_surface)
51 clear(); 51 clear();
52 } 52 }
53 } 53 }
54 54
55 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { } 55 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { }
56 56
57 SkCanvas* UnacceleratedImageBufferSurface::canvas() 57 SkCanvas* UnacceleratedImageBufferSurface::canvas()
58 { 58 {
59 return m_surface->getCanvas(); 59 return m_surface->getCanvas();
60 } 60 }
61 61
62 const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite() 62 const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite()
63 { 63 {
64 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode); 64 m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);
65 return m_surface->getCanvas()->getDevice()->accessBitmap(false); 65 return m_surface->getCanvas()->getDevice()->accessBitmap(false);
66 } 66 }
67 67
68 bool UnacceleratedImageBufferSurface::isValid() const 68 bool UnacceleratedImageBufferSurface::isValid() const
69 { 69 {
70 return m_surface; 70 return m_surface;
71 } 71 }
72 72
73 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(Accelerati onHint) 73 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(Accelerati onHint)
74 { 74 {
75 return adoptRef(m_surface->newImageSnapshot()); 75 return adoptRef(m_surface->newImageSnapshot());
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698