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

Side by Side Diff: sky/engine/core/rendering/RenderImageResource.h

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 usesImageContainerSize() const { return m_cachedImage ? m_cache dImage->usesImageContainerSize() : false; } 63 virtual bool usesImageContainerSize() const { return m_cachedImage ? m_cache dImage->usesImageContainerSize() : false; }
64 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; } 64 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; }
65 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; } 65 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; }
66 66
67 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); } 67 virtual LayoutSize imageSize() const { return getImageSize(ImageResource::No rmalSize); }
68 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); } 68 virtual LayoutSize intrinsicSize() const { return getImageSize(ImageResource ::IntrinsicSize); }
69 69
70 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); } 70 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
71 71
72 protected: 72 protected:
73 RenderImageResource(); 73 RenderImageResource();
74 RenderObject* m_renderer; 74 RenderObject* m_renderer;
75 ResourcePtr<ImageResource> m_cachedImage; 75 ResourcePtr<ImageResource> m_cachedImage;
76 76
77 private: 77 private:
78 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const; 78 LayoutSize getImageSize(ImageResource::SizeType) const;
79 }; 79 };
80 80
81 } // namespace blink 81 } // namespace blink
82 82
83 #endif // RenderImage_h 83 #endif // RenderImage_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderImage.cpp ('k') | sky/engine/core/rendering/RenderImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698