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

Side by Side Diff: Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 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) 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // Stub implementations of pure virtual Image functions. 86 // Stub implementations of pure virtual Image functions.
87 virtual void destroyDecodedData() OVERRIDE 87 virtual void destroyDecodedData() OVERRIDE
88 { 88 {
89 } 89 }
90 90
91 virtual unsigned decodedSize() const OVERRIDE 91 virtual unsigned decodedSize() const OVERRIDE
92 { 92 {
93 return 0u; 93 return 0u;
94 } 94 }
95 95
96 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Colo rSpace, CompositeOperator, BlendMode) OVERRIDE 96 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, BlendMode) OVERRIDE
97 { 97 {
98 } 98 }
99 99
100 private: 100 private:
101 101
102 IntSize m_size; 102 IntSize m_size;
103 103
104 RefPtr<NativeImageSkia> m_nativeImage; 104 RefPtr<NativeImageSkia> m_nativeImage;
105 }; 105 };
106 106
(...skipping 17 matching lines...) Expand all
124 ASSERT_FALSE(graphicsLayer->contentsLayer()); 124 ASSERT_FALSE(graphicsLayer->contentsLayer());
125 125
126 graphicsLayer->setContentsToImage(opaqueImage.get()); 126 graphicsLayer->setContentsToImage(opaqueImage.get());
127 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque()); 127 ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque());
128 128
129 graphicsLayer->setContentsToImage(nonOpaqueImage.get()); 129 graphicsLayer->setContentsToImage(nonOpaqueImage.get());
130 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque()); 130 ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque());
131 } 131 }
132 132
133 } // namespace 133 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698