Chromium Code Reviews| Index: Source/web/ChromeClientImpl.cpp |
| diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp |
| index ee5bdbe1b2693ecb9f3d38f744f804418b04287b..399dd660372e119fe49755e988a70de34208f5a2 100644 |
| --- a/Source/web/ChromeClientImpl.cpp |
| +++ b/Source/web/ChromeClientImpl.cpp |
| @@ -579,13 +579,13 @@ void ChromeClientImpl::print(LocalFrame* frame) |
| m_webView->client()->printPage(WebLocalFrameImpl::fromFrame(frame)); |
| } |
| -PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalFrame* frame, ColorChooserClient* chooserClient, const Color&) |
| +PassOwnPtrWillBeRawPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalFrame* frame, ColorChooserClient* chooserClient, const Color&) |
| { |
| - OwnPtr<ColorChooserUIController> controller; |
| + OwnPtrWillBeRawPtr<ColorChooserUIController> controller = nullptr; |
|
Mike West
2014/10/06 18:45:32
Do you have to set this explicitly? Does the defau
sof
2014/10/06 19:19:29
Yes, RawPtr<> isn't zero initialized. This is the
|
| if (RuntimeEnabledFeatures::pagePopupEnabled()) |
| - controller = adoptPtr(new ColorChooserPopupUIController(frame, this, chooserClient)); |
| + controller = ColorChooserPopupUIController::create(frame, this, chooserClient); |
| else |
| - controller = adoptPtr(new ColorChooserUIController(frame, chooserClient)); |
| + controller = ColorChooserUIController::create(frame, chooserClient); |
| controller->openUI(); |
| return controller.release(); |
| } |