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

Side by Side Diff: Source/core/layout/LayoutImageResource.h

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutImageResource.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) 1999 Lars Knoll <knoll@kde.org> 2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> 4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
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, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIB. If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #ifndef RenderImageResource_h 26 #ifndef LayoutImageResource_h
27 #define RenderImageResource_h 27 #define LayoutImageResource_h
28 28
29 #include "core/fetch/ImageResource.h" 29 #include "core/fetch/ImageResource.h"
30 #include "core/fetch/ResourcePtr.h" 30 #include "core/fetch/ResourcePtr.h"
31 #include "core/layout/style/StyleImage.h" 31 #include "core/layout/style/StyleImage.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class LayoutObject; 35 class LayoutObject;
36 36
37 class RenderImageResource { 37 class LayoutImageResource {
38 WTF_MAKE_NONCOPYABLE(RenderImageResource); WTF_MAKE_FAST_ALLOCATED; 38 WTF_MAKE_NONCOPYABLE(LayoutImageResource); WTF_MAKE_FAST_ALLOCATED;
39 public: 39 public:
40 virtual ~RenderImageResource(); 40 virtual ~LayoutImageResource();
41 41
42 static PassOwnPtr<RenderImageResource> create() 42 static PassOwnPtr<LayoutImageResource> create()
43 { 43 {
44 return adoptPtr(new RenderImageResource); 44 return adoptPtr(new LayoutImageResource);
45 } 45 }
46 46
47 virtual void initialize(LayoutObject*); 47 virtual void initialize(LayoutObject*);
48 virtual void shutdown(); 48 virtual void shutdown();
49 49
50 void setImageResource(ImageResource*); 50 void setImageResource(ImageResource*);
51 ImageResource* cachedImage() const { return m_cachedImage.get(); } 51 ImageResource* cachedImage() const { return m_cachedImage.get(); }
52 virtual bool hasImage() const { return m_cachedImage; } 52 virtual bool hasImage() const { return m_cachedImage; }
53 53
54 void resetAnimation(); 54 void resetAnimation();
55 55
56 virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) c onst 56 virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) c onst
57 { 57 {
58 return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Ima ge::nullImage(); 58 return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Ima ge::nullImage();
59 } 59 }
60 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); } 60 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); }
61 61
62 virtual void setContainerSizeForRenderer(const IntSize&); 62 virtual void setContainerSizeForRenderer(const IntSize&);
63 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; } 63 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; }
64 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; } 64 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; }
65 65
66 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); } 66 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); }
67 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); } 67 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); }
68 68
69 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); } 69 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
70 70
71 protected: 71 protected:
72 RenderImageResource(); 72 LayoutImageResource();
73 LayoutObject* m_renderer; 73 LayoutObject* m_renderer;
74 ResourcePtr<ImageResource> m_cachedImage; 74 ResourcePtr<ImageResource> m_cachedImage;
75 75
76 private: 76 private:
77 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const; 77 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const;
78 }; 78 };
79 79
80 } // namespace blink 80 } // namespace blink
81 81
82 #endif // RenderImage_h 82 #endif // LayoutImage_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698