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

Unified Diff: Source/core/html/forms/ColorInputType.h

Issue 631833002: Move color chooser objects to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make ColorChooserUIController::m_client protected, not private Created 6 years, 2 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/core/html/forms/ColorInputType.h
diff --git a/Source/core/html/forms/ColorInputType.h b/Source/core/html/forms/ColorInputType.h
index 13adc815a88142b3a3c9ec1f4bd8d4a3745d660d..4bd18fcd7801a308b212a1e5f7c9d0a24303f439 100644
--- a/Source/core/html/forms/ColorInputType.h
+++ b/Source/core/html/forms/ColorInputType.h
@@ -39,41 +39,43 @@ namespace blink {
class ColorChooser;
class ColorInputType FINAL : public BaseClickableWithKeyInputType, public ColorChooserClient {
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ColorInputType);
public:
static PassRefPtrWillBeRawPtr<InputType> create(HTMLInputElement&);
virtual ~ColorInputType();
+ virtual void trace(Visitor*) override;
// ColorChooserClient implementation.
- virtual void didChooseColor(const Color&) OVERRIDE;
- virtual void didEndChooser() OVERRIDE;
- virtual Element& ownerElement() const OVERRIDE;
- virtual IntRect elementRectRelativeToRootView() const OVERRIDE;
- virtual Color currentColor() OVERRIDE;
- virtual bool shouldShowSuggestions() const OVERRIDE;
- virtual Vector<ColorSuggestion> suggestions() const OVERRIDE;
- ColorChooserClient* colorChooserClient() OVERRIDE;
+ virtual void didChooseColor(const Color&) override;
+ virtual void didEndChooser() override;
+ virtual Element& ownerElement() const override;
+ virtual IntRect elementRectRelativeToRootView() const override;
+ virtual Color currentColor() override;
+ virtual bool shouldShowSuggestions() const override;
+ virtual Vector<ColorSuggestion> suggestions() const override;
+ ColorChooserClient* colorChooserClient() override;
private:
ColorInputType(HTMLInputElement& element) : BaseClickableWithKeyInputType(element) { }
- virtual void countUsage() OVERRIDE;
- virtual const AtomicString& formControlType() const OVERRIDE;
- virtual bool supportsRequired() const OVERRIDE;
- virtual String fallbackValue() const OVERRIDE;
- virtual String sanitizeValue(const String&) const OVERRIDE;
- virtual void createShadowSubtree() OVERRIDE;
- virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior) OVERRIDE;
- virtual void handleDOMActivateEvent(Event*) OVERRIDE;
- virtual void closePopupView() OVERRIDE;
- virtual bool shouldRespectListAttribute() OVERRIDE;
- virtual bool typeMismatchFor(const String&) const OVERRIDE;
- virtual void updateView() OVERRIDE;
- virtual AXObject* popupRootAXObject() OVERRIDE;
+ virtual void countUsage() override;
+ virtual const AtomicString& formControlType() const override;
+ virtual bool supportsRequired() const override;
+ virtual String fallbackValue() const override;
+ virtual String sanitizeValue(const String&) const override;
+ virtual void createShadowSubtree() override;
+ virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override;
+ virtual void handleDOMActivateEvent(Event*) override;
+ virtual void closePopupView() override;
+ virtual bool shouldRespectListAttribute() override;
+ virtual bool typeMismatchFor(const String&) const override;
+ virtual void updateView() override;
+ virtual AXObject* popupRootAXObject() override;
Color valueAsColor() const;
void endColorChooser();
HTMLElement* shadowColorSwatch() const;
- OwnPtr<ColorChooser> m_chooser;
+ OwnPtrWillBeMember<ColorChooser> m_chooser;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698