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

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

Issue 25976002: Remove ImageSource::bytesDecodedToDetermineProperties() and fallout (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: For landing again, rebased Created 7 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
« no previous file with comments | « Source/web/tests/DragImageTest.cpp ('k') | no next file » | 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 return 0; 82 return 0;
83 83
84 return m_nativeImage; 84 return m_nativeImage;
85 } 85 }
86 86
87 // Stub implementations of pure virtual Image functions. 87 // Stub implementations of pure virtual Image functions.
88 virtual void destroyDecodedData(bool) OVERRIDE 88 virtual void destroyDecodedData(bool) OVERRIDE
89 { 89 {
90 } 90 }
91 91
92 virtual unsigned decodedSize() const OVERRIDE
93 {
94 return 0u;
95 }
96
97 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, BlendMode) OVERRIDE 92 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, BlendMode) OVERRIDE
98 { 93 {
99 } 94 }
100 95
101 private: 96 private:
102 97
103 IntSize m_size; 98 IntSize m_size;
104 99
105 RefPtr<NativeImageSkia> m_nativeImage; 100 RefPtr<NativeImageSkia> m_nativeImage;
106 }; 101 };
(...skipping 18 matching lines...) Expand all
125 ASSERT_FALSE(graphicsLayer->contentsLayer()); 120 ASSERT_FALSE(graphicsLayer->contentsLayer());
126 121
127 graphicsLayer->setContentsToImage(opaqueImage.get()); 122 graphicsLayer->setContentsToImage(opaqueImage.get());
128 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque()); 123 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque());
129 124
130 graphicsLayer->setContentsToImage(nonOpaqueImage.get()); 125 graphicsLayer->setContentsToImage(nonOpaqueImage.get());
131 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque()); 126 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque());
132 } 127 }
133 128
134 } // namespace 129 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/DragImageTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698