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

Unified Diff: Source/web/ColorChooserPopupUIController.h

Issue 631833002: Move color chooser objects to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/web/ColorChooserPopupUIController.h
diff --git a/Source/web/ColorChooserPopupUIController.h b/Source/web/ColorChooserPopupUIController.h
index ee9d531c8c32595e407da629e44a765a692b3e6f..367ba1a5ba642fb8256792438358a79353071b3a 100644
--- a/Source/web/ColorChooserPopupUIController.h
+++ b/Source/web/ColorChooserPopupUIController.h
@@ -36,38 +36,45 @@ class ChromeClientImpl;
class ColorChooserClient;
class PagePopup;
-class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public PagePopupClient {
+class ColorChooserPopupUIController final : public ColorChooserUIController, public PagePopupClient {
public:
- ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
+ static PassOwnPtrWillBeRawPtr<ColorChooserPopupUIController> create(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)
+ {
+ return adoptPtrWillBeNoop(new ColorChooserPopupUIController(frame, chromeClient, client));
+ }
+
virtual ~ColorChooserPopupUIController();
+ virtual void trace(Visitor*) override;
// ColorChooserUIController functions:
- virtual void openUI() OVERRIDE;
+ virtual void openUI() override;
// ColorChooser functions
- virtual void endChooser() OVERRIDE;
- virtual AXObject* rootAXObject() OVERRIDE;
+ virtual void endChooser() override;
+ virtual AXObject* rootAXObject() override;
// PagePopupClient functions:
- virtual IntSize contentSize() OVERRIDE;
- virtual void writeDocument(SharedBuffer*) OVERRIDE;
- virtual Locale& locale() OVERRIDE;
- virtual void setValueAndClosePopup(int, const String&) OVERRIDE;
- virtual void setValue(const String&) OVERRIDE;
- virtual void closePopup() OVERRIDE;
- virtual Element& ownerElement() OVERRIDE;
- virtual void didClosePopup() OVERRIDE;
+ virtual IntSize contentSize() override;
+ virtual void writeDocument(SharedBuffer*) override;
+ virtual Locale& locale() override;
+ virtual void setValueAndClosePopup(int, const String&) override;
+ virtual void setValue(const String&) override;
+ virtual void closePopup() override;
+ virtual Element& ownerElement() override;
+ virtual void didClosePopup() override;
Mike West 2014/10/06 18:45:32 C++11!1!!!1!
sof 2014/10/06 19:19:29 I know there are renaming CLs coming down the chut
Mike West 2014/10/06 19:29:29 I agree. You should feel free to clean up as you g
tkent 2014/10/07 02:25:00 FYI. Our new rule is to remove |virtual| if a fun
private:
+ ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
+
void openPopup();
ChromeClientImpl* m_chromeClient;
- ColorChooserClient* m_client;
+ RawPtrWillBeMember<ColorChooserClient> m_client;
PagePopup* m_popup;
haraken 2014/10/07 03:31:29 This raw pointer looks safe since it's cleared in
Locale& m_locale;
};
-}
+} // namespace blink
#endif // ColorChooserPopupUIController_h

Powered by Google App Engine
This is Rietveld 408576698