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

Side by Side Diff: Source/web/tests/ImageLayerChromiumTest.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/DragImageTest.cpp ('k') | Source/web/tests/PopupMenuTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 virtual IntSize size() const OVERRIDE 72 virtual IntSize size() const OVERRIDE
73 { 73 {
74 return m_size; 74 return m_size;
75 } 75 }
76 76
77 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE 77 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE
78 { 78 {
79 if (m_size.isZero()) 79 if (m_size.isZero())
80 return 0; 80 return nullptr;
81 81
82 return m_nativeImage; 82 return m_nativeImage;
83 } 83 }
84 84
85 // Stub implementations of pure virtual Image functions. 85 // Stub implementations of pure virtual Image functions.
86 virtual void destroyDecodedData(bool) OVERRIDE 86 virtual void destroyDecodedData(bool) OVERRIDE
87 { 87 {
88 } 88 }
89 89
90 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, blink::WebBlendMode) OVERRIDE 90 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, blink::WebBlendMode) OVERRIDE
(...skipping 29 matching lines...) Expand all
120 ASSERT_FALSE(graphicsLayer->contentsLayer()); 120 ASSERT_FALSE(graphicsLayer->contentsLayer());
121 121
122 graphicsLayer->setContentsToImage(opaqueImage.get()); 122 graphicsLayer->setContentsToImage(opaqueImage.get());
123 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque()); 123 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque());
124 124
125 graphicsLayer->setContentsToImage(nonOpaqueImage.get()); 125 graphicsLayer->setContentsToImage(nonOpaqueImage.get());
126 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque()); 126 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque());
127 } 127 }
128 128
129 } // namespace 129 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/DragImageTest.cpp ('k') | Source/web/tests/PopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698