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

Side by Side Diff: Source/web/ColorChooserUIController.h

Issue 631833002: Move color chooser objects to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Keep ~ColorInputType empty 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 unified diff | Download patch
« no previous file with comments | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/ColorChooserUIController.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ColorChooserUIController_h 26 #ifndef ColorChooserUIController_h
27 #define ColorChooserUIController_h 27 #define ColorChooserUIController_h
28 28
29 #include "core/html/forms/ColorChooser.h" 29 #include "core/html/forms/ColorChooser.h"
30 #include "platform/heap/Handle.h"
30 #include "platform/text/PlatformLocale.h" 31 #include "platform/text/PlatformLocale.h"
31 #include "public/web/WebColorChooserClient.h" 32 #include "public/web/WebColorChooserClient.h"
32 #include "wtf/OwnPtr.h" 33 #include "wtf/OwnPtr.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 class ColorChooserClient; 37 class ColorChooserClient;
37 class LocalFrame; 38 class LocalFrame;
38 class WebColorChooser; 39 class WebColorChooser;
39 40
40 class ColorChooserUIController : public WebColorChooserClient, public ColorChoos er { 41 class ColorChooserUIController : public NoBaseWillBeGarbageCollectedFinalized<Co lorChooserUIController>, public WebColorChooserClient, public ColorChooser {
42 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController);
41 public: 43 public:
42 ColorChooserUIController(LocalFrame*, ColorChooserClient*); 44 static PassOwnPtrWillBeRawPtr<ColorChooserUIController> create(LocalFrame* f rame, ColorChooserClient* client)
45 {
46 return adoptPtrWillBeNoop(new ColorChooserUIController(frame, client));
47 }
48
43 virtual ~ColorChooserUIController(); 49 virtual ~ColorChooserUIController();
50 virtual void trace(Visitor*) override;
44 51
45 virtual void openUI(); 52 virtual void openUI();
46 53
47 // ColorChooser functions: 54 // ColorChooser functions:
48 virtual void setSelectedColor(const Color&) override final; 55 virtual void setSelectedColor(const Color&) override final;
49 virtual void endChooser() override; 56 virtual void endChooser() override;
50 virtual AXObject* rootAXObject() override; 57 virtual AXObject* rootAXObject() override;
51 58
52 // WebColorChooserClient functions: 59 // WebColorChooserClient functions:
53 virtual void didChooseColor(const WebColor&) override final; 60 virtual void didChooseColor(const WebColor&) override final;
54 virtual void didEndChooser() override final; 61 virtual void didEndChooser() override final;
55 62
56 protected: 63 protected:
64 ColorChooserUIController(LocalFrame*, ColorChooserClient*);
65
57 void openColorChooser(); 66 void openColorChooser();
58 OwnPtr<WebColorChooser> m_chooser; 67 OwnPtr<WebColorChooser> m_chooser;
68 RawPtrWillBeMember<ColorChooserClient> m_client;
59 69
60 private: 70 private:
61 LocalFrame* m_frame; 71 RawPtrWillBeMember<LocalFrame> m_frame;
62 ColorChooserClient* m_client;
63 }; 72 };
64 73
65 } 74 } // namespace blink
66 75
67 #endif // ColorChooserUIController_h 76 #endif // ColorChooserUIController_h
OLDNEW
« no previous file with comments | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/ColorChooserUIController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698