Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: Source/core/rendering/style/StyleFetchedImage.cpp

Issue 203413008: Revert of Web Animations API: Load resources referenced in element.animate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/resolver/StyleResourceLoader.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
28 #include "core/fetch/ImageResource.h" 27 #include "core/fetch/ImageResource.h"
29 #include "core/rendering/RenderObject.h" 28 #include "core/rendering/RenderObject.h"
30 29
31 namespace WebCore { 30 namespace WebCore {
32 31
33 StyleFetchedImage::StyleFetchedImage(ImageResource* image) 32 StyleFetchedImage::StyleFetchedImage(ImageResource* image)
34 : m_image(image) 33 : m_image(image)
35 { 34 {
36 m_isImageResource = true; 35 m_isImageResource = true;
37 m_image->addClient(this); 36 m_image->addClient(this);
38 } 37 }
39 38
40 StyleFetchedImage::~StyleFetchedImage() 39 StyleFetchedImage::~StyleFetchedImage()
41 { 40 {
42 m_image->removeClient(this); 41 m_image->removeClient(this);
43 } 42 }
44 43
45 PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::cssValue() const 44 PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::cssValue() const
46 { 45 {
47 return CSSImageValue::create(m_image->url(), const_cast<StyleFetchedImage*>( this)); 46 return CSSPrimitiveValue::create(m_image->url().string(), CSSPrimitiveValue: :CSS_URI);
48 } 47 }
49 48
50 bool StyleFetchedImage::canRender(const RenderObject* renderer, float multiplier ) const 49 bool StyleFetchedImage::canRender(const RenderObject* renderer, float multiplier ) const
51 { 50 {
52 return m_image->canRender(renderer, multiplier); 51 return m_image->canRender(renderer, multiplier);
53 } 52 }
54 53
55 bool StyleFetchedImage::isLoaded() const 54 bool StyleFetchedImage::isLoaded() const
56 { 55 {
57 return m_image->isLoaded(); 56 return m_image->isLoaded();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 { 105 {
107 return m_image->imageForRenderer(renderer); 106 return m_image->imageForRenderer(renderer);
108 } 107 }
109 108
110 bool StyleFetchedImage::knownToBeOpaque(const RenderObject* renderer) const 109 bool StyleFetchedImage::knownToBeOpaque(const RenderObject* renderer) const
111 { 110 {
112 return m_image->currentFrameKnownToBeOpaque(renderer); 111 return m_image->currentFrameKnownToBeOpaque(renderer);
113 } 112 }
114 113
115 } 114 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResourceLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698