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

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

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 bool maybeAnimated() const; 55 bool maybeAnimated() const;
56 56
57 virtual PassRefPtr<Image> image(const IntSize&, float) const; 57 virtual PassRefPtr<Image> image(const IntSize&, float) const;
58 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); } 58 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); }
59 59
60 virtual bool imageHasRelativeSize() const { return m_cachedImage ? m_cachedI mage->imageHasRelativeSize() : false; } 60 virtual bool imageHasRelativeSize() const { return m_cachedImage ? m_cachedI mage->imageHasRelativeSize() : false; }
61 61
62 virtual LayoutSize imageSize(float multiplier) const; 62 virtual LayoutSize concreteObjectSize(const FloatSize& defaultObjectSize, fl oat multiplier) const;
63 LayoutSize defaultConcreteObjectSize(float multiplier) const
64 {
65 return concreteObjectSize(FloatSize(300, 150), multiplier);
66 }
63 67
64 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); } 68 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
65 69
66 DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(m_cachedImage); } 70 DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(m_cachedImage); }
67 71
68 protected: 72 protected:
69 LayoutImageResource(); 73 LayoutImageResource();
70 LayoutObject* m_layoutObject; 74 LayoutObject* m_layoutObject;
71 RefPtrWillBeMember<ImageResource> m_cachedImage; 75 RefPtrWillBeMember<ImageResource> m_cachedImage;
72 }; 76 };
73 77
74 } // namespace blink 78 } // namespace blink
75 79
76 #endif // LayoutImage_h 80 #endif // LayoutImage_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698