| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 | 213 |
| 214 private: | 214 private: |
| 215 bool image_observer_disabled_; | 215 bool image_observer_disabled_; |
| 216 RefPtr<SharedBuffer> encoded_image_data_; | 216 RefPtr<SharedBuffer> encoded_image_data_; |
| 217 // TODO(Oilpan): consider having Image on the Oilpan heap and | 217 // TODO(Oilpan): consider having Image on the Oilpan heap and |
| 218 // turn this into a Member<>. | 218 // turn this into a Member<>. |
| 219 // | 219 // |
| 220 // The observer (an ImageResourceContent) is an untraced member, with the | 220 // The observer (an ImageResourceContent) is an untraced member, with the |
| 221 // ImageResourceContent being responsible for clearing itself out. | 221 // ImageResourceContent being responsible for clearing itself out. |
| 222 UntracedMember<ImageObserver> image_observer_; | 222 UntracedMember<ImageObserver> image_observer_; |
| 223 PaintImage::Id stable_image_id_; | |
| 224 }; | 223 }; |
| 225 | 224 |
| 226 #define DEFINE_IMAGE_TYPE_CASTS(typeName) \ | 225 #define DEFINE_IMAGE_TYPE_CASTS(typeName) \ |
| 227 DEFINE_TYPE_CASTS(typeName, Image, image, image->Is##typeName(), \ | 226 DEFINE_TYPE_CASTS(typeName, Image, image, image->Is##typeName(), \ |
| 228 image.Is##typeName()) | 227 image.Is##typeName()) |
| 229 | 228 |
| 230 } // namespace blink | 229 } // namespace blink |
| 231 | 230 |
| 232 #endif | 231 #endif |
| OLD | NEW |