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

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

Issue 1320563003: Oilpan: avoid using WeakPtr<> for heap residing objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: revert unrelated unit test addition 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 | Annotate | Revision Log
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 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 private: 119 private:
120 #if !ENABLE(OILPAN) 120 #if !ENABLE(OILPAN)
121 virtual void refFormAssociatedElement() = 0; 121 virtual void refFormAssociatedElement() = 0;
122 virtual void derefFormAssociatedElement() = 0; 122 virtual void derefFormAssociatedElement() = 0;
123 #endif 123 #endif
124 124
125 void setFormAttributeTargetObserver(PassOwnPtrWillBeRawPtr<FormAttributeTarg etObserver>); 125 void setFormAttributeTargetObserver(PassOwnPtrWillBeRawPtr<FormAttributeTarg etObserver>);
126 void resetFormAttributeTargetObserver(); 126 void resetFormAttributeTargetObserver();
127 127
128 OwnPtrWillBeMember<FormAttributeTargetObserver> m_formAttributeTargetObserve r; 128 OwnPtrWillBeMember<FormAttributeTargetObserver> m_formAttributeTargetObserve r;
129 #if ENABLE(OILPAN) 129 WeakPtrWillBeMember<HTMLFormElement> m_form;
130 Member<HTMLFormElement> m_form;
131 #else
132 WeakPtr<HTMLFormElement> m_form;
133 #endif
134 OwnPtrWillBeMember<ValidityState> m_validityState; 130 OwnPtrWillBeMember<ValidityState> m_validityState;
135 String m_customValidationMessage; 131 String m_customValidationMessage;
136 // Non-Oilpan: Even if m_formWasSetByParser is true, m_form can be null 132 // Non-Oilpan: Even if m_formWasSetByParser is true, m_form can be null
137 // because parentNode is not a strong reference and |this| and m_form don't 133 // because parentNode is not a strong reference and |this| and m_form don't
138 // die together. 134 // die together.
139 // Oilpan: If m_formWasSetByParser is true, m_form is always non-null. 135 // Oilpan: If m_formWasSetByParser is true, m_form is always non-null.
140 bool m_formWasSetByParser; 136 bool m_formWasSetByParser;
141 }; 137 };
142 138
143 HTMLElement* toHTMLElement(FormAssociatedElement*); 139 HTMLElement* toHTMLElement(FormAssociatedElement*);
144 HTMLElement& toHTMLElement(FormAssociatedElement&); 140 HTMLElement& toHTMLElement(FormAssociatedElement&);
145 const HTMLElement* toHTMLElement(const FormAssociatedElement*); 141 const HTMLElement* toHTMLElement(const FormAssociatedElement*);
146 const HTMLElement& toHTMLElement(const FormAssociatedElement&); 142 const HTMLElement& toHTMLElement(const FormAssociatedElement&);
147 143
148 } // namespace 144 } // namespace
149 145
150 #endif // FormAssociatedElement_h 146 #endif // FormAssociatedElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698