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

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

Issue 1173973003: getTopDevice is deprecated (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode); 66 canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode);
67 else 67 else
68 canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode); 68 canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
69 } 69 }
70 } 70 }
71 71
72 const SkBitmap& ImageBufferSurface::bitmap() 72 const SkBitmap& ImageBufferSurface::bitmap()
73 { 73 {
74 ASSERT(canvas()); 74 ASSERT(canvas());
75 willAccessPixels(); 75 willAccessPixels();
76 return canvas()->getTopDevice()->accessBitmap(false); 76 return canvas()->getDevice()->accessBitmap(false);
77 } 77 }
78 78
79 const SkBitmap& ImageBufferSurface::cachedBitmap() const 79 const SkBitmap& ImageBufferSurface::cachedBitmap() const
80 { 80 {
81 DEFINE_STATIC_LOCAL(SkBitmap, nullBitmap, ()); 81 DEFINE_STATIC_LOCAL(SkBitmap, nullBitmap, ());
82 return nullBitmap; 82 return nullBitmap;
83 } 83 }
84 84
85 PassRefPtr<SkImage> ImageBufferSurface::newImageSnapshot() const 85 PassRefPtr<SkImage> ImageBufferSurface::newImageSnapshot() const
86 { 86 {
(...skipping 18 matching lines...) Expand all
105 updateCachedBitmapIfNeeded(); 105 updateCachedBitmapIfNeeded();
106 bmp = cachedBitmap(); 106 bmp = cachedBitmap();
107 } 107 }
108 108
109 RefPtr<Image> image = BitmapImage::create(needsCopy ? deepSkBitmapCopy(bmp) : bmp); 109 RefPtr<Image> image = BitmapImage::create(needsCopy ? deepSkBitmapCopy(bmp) : bmp);
110 110
111 context->drawImage(image.get(), destRect, srcRect, op, DoNotRespectImageOrie ntation); 111 context->drawImage(image.get(), destRect, srcRect, op, DoNotRespectImageOrie ntation);
112 } 112 }
113 113
114 } // namespace blink 114 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698