| 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, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple 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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 // while trying to skip frames we hit the last frame and thus had to stop. | 553 // while trying to skip frames we hit the last frame and thus had to stop. |
| 554 if (skippingFrames != advancedAnimation) | 554 if (skippingFrames != advancedAnimation) |
| 555 imageObserver()->animationAdvanced(this); | 555 imageObserver()->animationAdvanced(this); |
| 556 return advancedAnimation; | 556 return advancedAnimation; |
| 557 } | 557 } |
| 558 | 558 |
| 559 bool BitmapImage::mayFillWithSolidColor() | 559 bool BitmapImage::mayFillWithSolidColor() |
| 560 { | 560 { |
| 561 if (!m_checkedForSolidColor && frameCount() > 0) { | 561 if (!m_checkedForSolidColor && frameCount() > 0) { |
| 562 checkForSolidColor(); | 562 checkForSolidColor(); |
| 563 // WINCE PORT: checkForSolidColor() doesn't set m_checkedForSolidColor u
ntil | |
| 564 // it gets enough information to make final decision. | |
| 565 #if !OS(WINCE) | |
| 566 ASSERT(m_checkedForSolidColor); | 563 ASSERT(m_checkedForSolidColor); |
| 567 #endif | |
| 568 } | 564 } |
| 569 return m_isSolidColor && !m_currentFrame; | 565 return m_isSolidColor && !m_currentFrame; |
| 570 } | 566 } |
| 571 | 567 |
| 572 Color BitmapImage::solidColor() const | 568 Color BitmapImage::solidColor() const |
| 573 { | 569 { |
| 574 return m_solidColor; | 570 return m_solidColor; |
| 575 } | 571 } |
| 576 | 572 |
| 577 void BitmapImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 573 void BitmapImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
| 578 { | 574 { |
| 579 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image); | 575 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image); |
| 580 memoryObjectInfo->setClassName("BitmapImage"); | 576 memoryObjectInfo->setClassName("BitmapImage"); |
| 581 Image::reportMemoryUsage(memoryObjectInfo); | 577 Image::reportMemoryUsage(memoryObjectInfo); |
| 582 info.addMember(m_source, "source"); | 578 info.addMember(m_source, "source"); |
| 583 info.addMember(m_frameTimer, "frameTimer"); | 579 info.addMember(m_frameTimer, "frameTimer"); |
| 584 info.addMember(m_frames, "frames"); | 580 info.addMember(m_frames, "frames"); |
| 585 } | 581 } |
| 586 | 582 |
| 587 void FrameData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 583 void FrameData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
| 588 { | 584 { |
| 589 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image); | 585 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image); |
| 590 memoryObjectInfo->setClassName("FrameData"); | 586 memoryObjectInfo->setClassName("FrameData"); |
| 591 info.addMember(m_frame, "frame", WTF::RetainingPointer); | 587 info.addMember(m_frame, "frame", WTF::RetainingPointer); |
| 592 } | 588 } |
| 593 | 589 |
| 594 } | 590 } |
| OLD | NEW |