OLD | NEW |
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 public: | 47 public: |
48 FakeImageObserver() : m_lastDecodedSizeChangedDelta(0) { } | 48 FakeImageObserver() : m_lastDecodedSizeChangedDelta(0) { } |
49 | 49 |
50 virtual void decodedSizeChanged(const Image*, int delta) | 50 virtual void decodedSizeChanged(const Image*, int delta) |
51 { | 51 { |
52 m_lastDecodedSizeChangedDelta = delta; | 52 m_lastDecodedSizeChangedDelta = delta; |
53 } | 53 } |
54 virtual void didDraw(const Image*) override { } | 54 virtual void didDraw(const Image*) override { } |
55 virtual bool shouldPauseAnimation(const Image*) override { return false;
} | 55 virtual bool shouldPauseAnimation(const Image*) override { return false;
} |
56 virtual void animationAdvanced(const Image*) override { } | 56 virtual void animationAdvanced(const Image*) override { } |
| 57 virtual void imageAnimationPolicy(const Image*, ImageAnimationPolicy&) o
verride { } |
| 58 |
57 virtual void changedInRect(const Image*, const IntRect&) { } | 59 virtual void changedInRect(const Image*, const IntRect&) { } |
58 | 60 |
59 int m_lastDecodedSizeChangedDelta; | 61 int m_lastDecodedSizeChangedDelta; |
60 }; | 62 }; |
61 | 63 |
62 static PassRefPtr<SharedBuffer> readFile(const char* fileName) | 64 static PassRefPtr<SharedBuffer> readFile(const char* fileName) |
63 { | 65 { |
64 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(
); | 66 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(
); |
65 filePath.append(fileName); | 67 filePath.append(fileName); |
66 return Platform::current()->unitTestSupport()->readFromFile(filePath); | 68 return Platform::current()->unitTestSupport()->readFromFile(filePath); |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 TEST_F(BitmapImageTest, icoHasWrongFrameDimensions) | 240 TEST_F(BitmapImageTest, icoHasWrongFrameDimensions) |
239 { | 241 { |
240 loadImage("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico"); | 242 loadImage("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico"); |
241 // This call would cause crash without fix for 408026 | 243 // This call would cause crash without fix for 408026 |
242 imageForDefaultFrame(); | 244 imageForDefaultFrame(); |
243 } | 245 } |
244 | 246 |
245 #endif // USE(QCMSLIB) | 247 #endif // USE(QCMSLIB) |
246 | 248 |
247 } // namespace blink | 249 } // namespace blink |
OLD | NEW |