| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| 11 * | 11 * |
| 12 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Library General Public License for more details. | 15 * Library General Public License for more details. |
| 16 * | 16 * |
| 17 * You should have received a copy of the GNU Library General Public License | 17 * You should have received a copy of the GNU Library General Public License |
| 18 * along with this library; see the file COPYING.LIB. If not, write to | 18 * along with this library; see the file COPYING.LIB. If not, write to |
| 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 * Boston, MA 02110-1301, USA. | 20 * Boston, MA 02110-1301, USA. |
| 21 * | 21 * |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include "config.h" | 24 #include "config.h" |
| 25 #include "core/rendering/style/StyleFetchedImage.h" | 25 #include "core/rendering/style/StyleFetchedImage.h" |
| 26 | 26 |
| 27 #include "core/css/CSSImageValue.h" |
| 27 #include "core/fetch/ImageResource.h" | 28 #include "core/fetch/ImageResource.h" |
| 28 #include "core/rendering/RenderObject.h" | 29 #include "core/rendering/RenderObject.h" |
| 29 | 30 |
| 30 namespace WebCore { | 31 namespace WebCore { |
| 31 | 32 |
| 32 StyleFetchedImage::StyleFetchedImage(ImageResource* image) | 33 StyleFetchedImage::StyleFetchedImage(ImageResource* image) |
| 33 : m_image(image) | 34 : m_image(image) |
| 34 { | 35 { |
| 35 m_isImageResource = true; | 36 m_isImageResource = true; |
| 36 m_image->addClient(this); | 37 m_image->addClient(this); |
| 37 } | 38 } |
| 38 | 39 |
| 39 StyleFetchedImage::~StyleFetchedImage() | 40 StyleFetchedImage::~StyleFetchedImage() |
| 40 { | 41 { |
| 41 m_image->removeClient(this); | 42 m_image->removeClient(this); |
| 42 } | 43 } |
| 43 | 44 |
| 44 PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::cssValue() const | 45 PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::cssValue() const |
| 45 { | 46 { |
| 46 return CSSPrimitiveValue::create(m_image->url().string(), CSSPrimitiveValue:
:CSS_URI); | 47 return CSSImageValue::create(m_image->url(), const_cast<StyleFetchedImage*>(
this)); |
| 47 } | 48 } |
| 48 | 49 |
| 49 bool StyleFetchedImage::canRender(const RenderObject* renderer, float multiplier
) const | 50 bool StyleFetchedImage::canRender(const RenderObject* renderer, float multiplier
) const |
| 50 { | 51 { |
| 51 return m_image->canRender(renderer, multiplier); | 52 return m_image->canRender(renderer, multiplier); |
| 52 } | 53 } |
| 53 | 54 |
| 54 bool StyleFetchedImage::isLoaded() const | 55 bool StyleFetchedImage::isLoaded() const |
| 55 { | 56 { |
| 56 return m_image->isLoaded(); | 57 return m_image->isLoaded(); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 { | 106 { |
| 106 return m_image->imageForRenderer(renderer); | 107 return m_image->imageForRenderer(renderer); |
| 107 } | 108 } |
| 108 | 109 |
| 109 bool StyleFetchedImage::knownToBeOpaque(const RenderObject* renderer) const | 110 bool StyleFetchedImage::knownToBeOpaque(const RenderObject* renderer) const |
| 110 { | 111 { |
| 111 return m_image->currentFrameKnownToBeOpaque(renderer); | 112 return m_image->currentFrameKnownToBeOpaque(renderer); |
| 112 } | 113 } |
| 113 | 114 |
| 114 } | 115 } |
| OLD | NEW |