Chromium Code Reviews| Index: content/browser/web_contents/web_contents_view_android.cc |
| diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc |
| index 0dc8bf471cc26e6bdadcf88854b21981f2e4fa66..0b51d95a0633047a1b9dd95d5f5df8d7bfd83689 100644 |
| --- a/content/browser/web_contents/web_contents_view_android.cc |
| +++ b/content/browser/web_contents/web_contents_view_android.cc |
| @@ -81,10 +81,9 @@ WebContentsViewAndroid::WebContentsViewAndroid( |
| WebContentsImpl* web_contents, |
| WebContentsViewDelegate* delegate) |
| : web_contents_(web_contents), |
| - content_view_core_(NULL), |
| + content_view_core_(nullptr), |
| delegate_(delegate), |
| - synchronous_compositor_client_(nullptr) { |
| -} |
| + synchronous_compositor_client_(nullptr) {} |
| WebContentsViewAndroid::~WebContentsViewAndroid() { |
| if (view_.GetLayer()) |
| @@ -216,8 +215,8 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget( |
| // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an |
| // example of how this is achieved for InterstitialPages. |
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host); |
| - RenderWidgetHostViewAndroid* rwhv = |
| - new RenderWidgetHostViewAndroid(rwhi, content_view_core_); |
| + RenderWidgetHostViewAndroid* rwhv = new RenderWidgetHostViewAndroid( |
| + rwhi, content_view_core_, overscroll_refresh_handler_); |
| rwhv->SetSynchronousCompositorClient(synchronous_compositor_client_); |
| return rwhv; |
| } |
| @@ -225,7 +224,7 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget( |
| RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget( |
| RenderWidgetHost* render_widget_host) { |
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host); |
| - return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| + return new RenderWidgetHostViewAndroid(rwhi, nullptr, nullptr); |
|
boliu
2016/12/01 00:01:57
this breaks pull to refresh for popups
rlanday
2016/12/01 00:44:51
Hmm, my understanding here was that since we were
boliu
2016/12/01 00:50:38
For popups, CVC is set later, in WebContentsViewAn
|
| } |
| void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) { |