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

Side by Side Diff: Source/WebCore/rendering/style/StyleCachedImage.h

Issue 9424038: Merge 108100 - 2012-02-17 Nate Chapin <japhet@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 10 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
« no previous file with comments | « no previous file | Source/WebCore/rendering/style/StyleCachedImage.cpp » ('j') | 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 #ifndef StyleCachedImage_h 24 #ifndef StyleCachedImage_h
25 #define StyleCachedImage_h 25 #define StyleCachedImage_h
26 26
27 #include "CachedImage.h"
27 #include "CachedResourceHandle.h" 28 #include "CachedResourceHandle.h"
28 #include "StyleImage.h" 29 #include "StyleImage.h"
29 30
30 namespace WebCore { 31 namespace WebCore {
31 32
32 class CachedImage; 33 class StyleCachedImage : public StyleImage, private CachedImageClient {
33 34 WTF_MAKE_FAST_ALLOCATED;
34 class StyleCachedImage : public StyleImage {
35 public: 35 public:
36 static PassRefPtr<StyleCachedImage> create(CachedImage* image) { return adop tRef(new StyleCachedImage(image)); } 36 static PassRefPtr<StyleCachedImage> create(CachedImage* image) { return adop tRef(new StyleCachedImage(image)); }
37 virtual ~StyleCachedImage();
38
37 virtual WrappedImagePtr data() const { return m_image.get(); } 39 virtual WrappedImagePtr data() const { return m_image.get(); }
38 40
39 virtual PassRefPtr<CSSValue> cssValue() const; 41 virtual PassRefPtr<CSSValue> cssValue() const;
40 42
41 CachedImage* cachedImage() const { return m_image.get(); } 43 CachedImage* cachedImage() const { return m_image.get(); }
42 44
43 virtual bool canRender(const RenderObject*, float multiplier) const; 45 virtual bool canRender(const RenderObject*, float multiplier) const;
44 virtual bool isLoaded() const; 46 virtual bool isLoaded() const;
45 virtual bool errorOccurred() const; 47 virtual bool errorOccurred() const;
46 virtual IntSize imageSize(const RenderObject*, float multiplier) const; 48 virtual IntSize imageSize(const RenderObject*, float multiplier) const;
47 virtual bool imageHasRelativeWidth() const; 49 virtual bool imageHasRelativeWidth() const;
48 virtual bool imageHasRelativeHeight() const; 50 virtual bool imageHasRelativeHeight() const;
49 virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrins icWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio); 51 virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrins icWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
50 virtual bool usesImageContainerSize() const; 52 virtual bool usesImageContainerSize() const;
51 virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& , float); 53 virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& , float);
52 virtual void addClient(RenderObject*); 54 virtual void addClient(RenderObject*);
53 virtual void removeClient(RenderObject*); 55 virtual void removeClient(RenderObject*);
54 virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const; 56 virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
55 57
56 private: 58 private:
57 StyleCachedImage(CachedImage* image) 59 explicit StyleCachedImage(CachedImage*);
58 : m_image(image)
59 {
60 m_isCachedImage = true;
61 }
62 60
63 CachedResourceHandle<CachedImage> m_image; 61 CachedResourceHandle<CachedImage> m_image;
64 }; 62 };
65 63
66 } 64 }
67 #endif 65 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/rendering/style/StyleCachedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698