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

Side by Side Diff: Source/core/html/HTMLImageElement.h

Issue 688743002: Remove the composite attribute on <img> (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLAttributeNames.in ('k') | Source/core/html/HTMLImageElement.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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2008, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2008, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google 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.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 int height(bool ignorePendingStylesheets = false); 51 int height(bool ignorePendingStylesheets = false);
52 52
53 int naturalWidth() const; 53 int naturalWidth() const;
54 int naturalHeight() const; 54 int naturalHeight() const;
55 const String& currentSrc() const; 55 const String& currentSrc() const;
56 56
57 bool isServerMap() const; 57 bool isServerMap() const;
58 58
59 const AtomicString& altText() const; 59 const AtomicString& altText() const;
60 60
61 CompositeOperator compositeOperator() const { return m_compositeOperator; }
62
63 ImageResource* cachedImage() const { return imageLoader().image(); } 61 ImageResource* cachedImage() const { return imageLoader().image(); }
64 void setImageResource(ImageResource* i) { imageLoader().setImage(i); }; 62 void setImageResource(ImageResource* i) { imageLoader().setImage(i); };
65 63
66 void setLoadingImageDocument() { imageLoader().setLoadingImageDocument(); } 64 void setLoadingImageDocument() { imageLoader().setLoadingImageDocument(); }
67 65
68 void setHeight(int); 66 void setHeight(int);
69 67
70 KURL src() const; 68 KURL src() const;
71 void setSrc(const String&); 69 void setSrc(const String&);
72 70
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 void notifyViewportChanged(); 133 void notifyViewportChanged();
136 void createMediaQueryListIfDoesNotExist(); 134 void createMediaQueryListIfDoesNotExist();
137 135
138 OwnPtrWillBeMember<HTMLImageLoader> m_imageLoader; 136 OwnPtrWillBeMember<HTMLImageLoader> m_imageLoader;
139 RefPtrWillBeMember<ViewportChangeListener> m_listener; 137 RefPtrWillBeMember<ViewportChangeListener> m_listener;
140 #if ENABLE(OILPAN) 138 #if ENABLE(OILPAN)
141 Member<HTMLFormElement> m_form; 139 Member<HTMLFormElement> m_form;
142 #else 140 #else
143 WeakPtr<HTMLFormElement> m_form; 141 WeakPtr<HTMLFormElement> m_form;
144 #endif 142 #endif
145 CompositeOperator m_compositeOperator;
146 AtomicString m_bestFitImageURL; 143 AtomicString m_bestFitImageURL;
147 float m_imageDevicePixelRatio; 144 float m_imageDevicePixelRatio;
148 unsigned m_formWasSetByParser : 1; 145 unsigned m_formWasSetByParser : 1;
149 unsigned m_elementCreatedByParser : 1; 146 unsigned m_elementCreatedByParser : 1;
150 // Intrinsic sizing is viewport dependant if the 'w' descriptor was used for the picked resource. 147 // Intrinsic sizing is viewport dependant if the 'w' descriptor was used for the picked resource.
151 unsigned m_intrinsicSizingViewportDependant : 1; 148 unsigned m_intrinsicSizingViewportDependant : 1;
152 }; 149 };
153 150
154 } // namespace blink 151 } // namespace blink
155 152
156 #endif // HTMLImageElement_h 153 #endif // HTMLImageElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAttributeNames.in ('k') | Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698