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

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

Issue 1314793010: Support fragment URLs for all kinds of SVG images (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 3 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 30 matching lines...) Expand all
41 virtual ~LayoutImageResource(); 41 virtual ~LayoutImageResource();
42 42
43 static PassOwnPtrWillBeRawPtr<LayoutImageResource> create() 43 static PassOwnPtrWillBeRawPtr<LayoutImageResource> create()
44 { 44 {
45 return adoptPtrWillBeNoop(new LayoutImageResource); 45 return adoptPtrWillBeNoop(new LayoutImageResource);
46 } 46 }
47 47
48 virtual void initialize(LayoutObject*); 48 virtual void initialize(LayoutObject*);
49 virtual void shutdown(); 49 virtual void shutdown();
50 50
51 void setImageResource(ImageResource*); 51 void setImageResource(ImageResource*, const KURL& urlWithFragment);
52 ImageResource* cachedImage() const { return m_cachedImage.get(); } 52 ImageResource* cachedImage() const { return m_cachedImage.get(); }
53 virtual bool hasImage() const { return m_cachedImage; } 53 virtual bool hasImage() const { return m_cachedImage; }
54 54
55 void resetAnimation(); 55 void resetAnimation();
56 56
57 virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) c onst 57 virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) c onst
58 { 58 {
59 return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObjec t) : Image::nullImage(); 59 return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObjec t) : Image::nullImage();
60 } 60 }
61 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); } 61 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); }
62 62
63 virtual void setContainerSizeForLayoutObject(const IntSize&); 63 virtual void setContainerSizeForLayoutObject(const IntSize&);
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(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); }
68 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); } 68 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, 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 DEFINE_INLINE_VIRTUAL_TRACE() { } 72 DEFINE_INLINE_VIRTUAL_TRACE() { }
73 73
74 protected: 74 protected:
75 LayoutImageResource(); 75 LayoutImageResource();
76 LayoutObject* m_layoutObject; 76 LayoutObject* m_layoutObject;
77 ResourcePtr<ImageResource> m_cachedImage; 77 ResourcePtr<ImageResource> m_cachedImage;
78 KURL m_urlWithFragment;
78 79
79 private: 80 private:
80 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const; 81 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const;
81 }; 82 };
82 83
83 } // namespace blink 84 } // namespace blink
84 85
85 #endif // LayoutImage_h 86 #endif // LayoutImage_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698