| Index: third_party/WebKit/Source/web/ColorChooserUIController.h
|
| diff --git a/third_party/WebKit/Source/web/ColorChooserUIController.h b/third_party/WebKit/Source/web/ColorChooserUIController.h
|
| index fd6290e6f74b19260cc7b35f1276c3728661813d..57ce61d64a4e1b3156b501dbda651453c3d35c2b 100644
|
| --- a/third_party/WebKit/Source/web/ColorChooserUIController.h
|
| +++ b/third_party/WebKit/Source/web/ColorChooserUIController.h
|
| @@ -38,12 +38,12 @@ class ColorChooserClient;
|
| class LocalFrame;
|
| class WebColorChooser;
|
|
|
| -class ColorChooserUIController : public NoBaseWillBeGarbageCollectedFinalized<ColorChooserUIController>, public WebColorChooserClient, public ColorChooser {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController);
|
| +class ColorChooserUIController : public GarbageCollectedFinalized<ColorChooserUIController>, public WebColorChooserClient, public ColorChooser {
|
| + USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<ColorChooserUIController> create(LocalFrame* frame, ColorChooserClient* client)
|
| + static RawPtr<ColorChooserUIController> create(LocalFrame* frame, ColorChooserClient* client)
|
| {
|
| - return adoptPtrWillBeNoop(new ColorChooserUIController(frame, client));
|
| + return (new ColorChooserUIController(frame, client));
|
| }
|
|
|
| ~ColorChooserUIController() override;
|
| @@ -65,10 +65,10 @@ protected:
|
|
|
| void openColorChooser();
|
| OwnPtr<WebColorChooser> m_chooser;
|
| - RawPtrWillBeMember<ColorChooserClient> m_client;
|
| + Member<ColorChooserClient> m_client;
|
|
|
| private:
|
| - RawPtrWillBeMember<LocalFrame> m_frame;
|
| + Member<LocalFrame> m_frame;
|
| };
|
|
|
| } // namespace blink
|
|
|