OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
7 | 7 |
8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 } | 120 } |
121 | 121 |
122 void ImageResource::allClientsRemoved() | 122 void ImageResource::allClientsRemoved() |
123 { | 123 { |
124 m_pendingContainerSizeRequests.clear(); | 124 m_pendingContainerSizeRequests.clear(); |
125 if (m_image && !errorOccurred()) | 125 if (m_image && !errorOccurred()) |
126 m_image->resetAnimation(); | 126 m_image->resetAnimation(); |
127 Resource::allClientsRemoved(); | 127 Resource::allClientsRemoved(); |
128 } | 128 } |
129 | 129 |
130 pair<WebCore::Image*, float> ImageResource::brokenImage(float deviceScaleFactor)
const | 130 pair<WebCore::Image*, float> ImageResource::brokenImage(float deviceScaleFactor) |
131 { | 131 { |
132 if (deviceScaleFactor >= 2) { | 132 if (deviceScaleFactor >= 2) { |
133 DEFINE_STATIC_LOCAL(WebCore::Image*, brokenImageHiRes, (WebCore::Image::
loadPlatformResource("missingImage@2x").leakRef())); | 133 DEFINE_STATIC_LOCAL(RefPtr<WebCore::Image>, brokenImageHiRes, (WebCore::
Image::loadPlatformResource("missingImage@2x"))); |
134 return std::make_pair(brokenImageHiRes, 2); | 134 return std::make_pair(brokenImageHiRes.get(), 2); |
135 } | 135 } |
136 | 136 |
137 DEFINE_STATIC_LOCAL(WebCore::Image*, brokenImageLoRes, (WebCore::Image::load
PlatformResource("missingImage").leakRef())); | 137 DEFINE_STATIC_LOCAL(RefPtr<WebCore::Image>, brokenImageLoRes, (WebCore::Imag
e::loadPlatformResource("missingImage"))); |
138 return std::make_pair(brokenImageLoRes, 1); | 138 return std::make_pair(brokenImageLoRes.get(), 1); |
139 } | 139 } |
140 | 140 |
141 bool ImageResource::willPaintBrokenImage() const | 141 bool ImageResource::willPaintBrokenImage() const |
142 { | 142 { |
143 return errorOccurred(); | 143 return errorOccurred(); |
144 } | 144 } |
145 | 145 |
146 WebCore::Image* ImageResource::image() | 146 WebCore::Image* ImageResource::image() |
147 { | 147 { |
148 ASSERT(!isPurgeable()); | 148 ASSERT(!isPurgeable()); |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 | 442 |
443 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer) | 443 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer) |
444 { | 444 { |
445 WebCore::Image* image = imageForRenderer(renderer); | 445 WebCore::Image* image = imageForRenderer(renderer); |
446 if (image->isBitmapImage()) | 446 if (image->isBitmapImage()) |
447 image->nativeImageForCurrentFrame(); // force decode | 447 image->nativeImageForCurrentFrame(); // force decode |
448 return image->currentFrameKnownToBeOpaque(); | 448 return image->currentFrameKnownToBeOpaque(); |
449 } | 449 } |
450 | 450 |
451 } // namespace WebCore | 451 } // namespace WebCore |
OLD | NEW |