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

Side by Side Diff: Source/platform/graphics/ImageBufferSurface.cpp

Issue 455863002: Fixing bug in RecordingImageBufferSurface::writePixels when using DisplayList2DCanvas (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 6 years, 4 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode); 61 canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode);
62 else 62 else
63 canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode); 63 canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
64 didClearCanvas(); 64 didClearCanvas();
65 } 65 }
66 } 66 }
67 67
68 const SkBitmap& ImageBufferSurface::bitmap() 68 const SkBitmap& ImageBufferSurface::bitmap()
69 { 69 {
70 ASSERT(canvas()); 70 ASSERT(canvas());
71 willReadback(); 71 willAccessPixels();
72 return canvas()->getTopDevice()->accessBitmap(false); 72 return canvas()->getTopDevice()->accessBitmap(false);
73 } 73 }
74 74
75 const SkBitmap& ImageBufferSurface::cachedBitmap() const 75 const SkBitmap& ImageBufferSurface::cachedBitmap() const
76 { 76 {
77 DEFINE_STATIC_LOCAL(SkBitmap, nullBitmap, ()); 77 DEFINE_STATIC_LOCAL(SkBitmap, nullBitmap, ());
78 return nullBitmap; 78 return nullBitmap;
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/graphics/ImageBufferSurface.h ('k') | Source/platform/graphics/RecordingImageBufferSurface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698