Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: Source/WebCore/html/HTMLInputElement.h

Issue 12573007: Merge 145423 (Closed) Base URL:
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/html/HTMLInputElement.h
--- Source/WebCore/html/HTMLInputElement.h (revision 146140)
+++ Source/WebCore/html/HTMLInputElement.h (working copy)
@@ -35,6 +35,7 @@
class DragData;
class FileList;
class HTMLDataListElement;
+class HTMLImageLoader;
class HTMLOptionElement;
class Icon;
class InputType;
@@ -293,6 +294,9 @@
virtual void setRangeText(const String& replacement, ExceptionCode&) OVERRIDE;
virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&) OVERRIDE;
+ bool hasImageLoader() const { return m_imageLoader; }
+ HTMLImageLoader* imageLoader();
bool setupDateTimeChooserParameters(DateTimeChooserParameters&);
@@ -429,6 +433,10 @@
bool m_hasTouchEventHandler : 1;
OwnPtr<InputType> m_inputType;
+ // The ImageLoader must be owned by this element because the loader code assumes
+ // that it lives as long as its owning element lives. If we move the loader into
+ // the ImageInput object we may delete the loader while this element lives on.
+ OwnPtr<HTMLImageLoader> m_imageLoader;
OwnPtr<ListAttributeTargetObserver> m_listAttributeTargetObserver;

Powered by Google App Engine
This is Rietveld 408576698