| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 bool currentFrameKnownToBeOpaque() OVERRIDE | 90 virtual bool currentFrameKnownToBeOpaque() OVERRIDE |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 | 155 |
| 156 OwnPtr<DragImage> testImage = | 156 OwnPtr<DragImage> testImage = |
| 157 DragImage::create(url, testLabel, fontDescription, deviceScaleFactor); | 157 DragImage::create(url, testLabel, fontDescription, deviceScaleFactor); |
| 158 OwnPtr<DragImage> expectedImage = | 158 OwnPtr<DragImage> expectedImage = |
| 159 DragImage::create(url, expectedLabel, fontDescription, deviceScaleFactor
); | 159 DragImage::create(url, expectedLabel, fontDescription, deviceScaleFactor
); |
| 160 | 160 |
| 161 EXPECT_EQ(testImage->size().width(), expectedImage->size().width()); | 161 EXPECT_EQ(testImage->size().width(), expectedImage->size().width()); |
| 162 } | 162 } |
| 163 | 163 |
| 164 } // anonymous namespace | 164 } // anonymous namespace |
| OLD | NEW |