content/browser/android/overscroll_controller_android.cc - Issue 2528823002: Separate SwipeRefreshHandler and ContentViewCore

Unified Diff: content/browser/android/overscroll_controller_android.cc

Issue 2528823002: Separate SwipeRefreshHandler and ContentViewCore (Closed)

Patch Set: boliu's requested changes + some lint fixes Created 4 years 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

« no previous file with comments | « content/browser/android/overscroll_controller_android.h ('k') | content/browser/renderer_host/render_view_host_delegate_view.h » ('j') | content/browser/renderer_host/render_widget_host_view_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/overscroll_controller_android.cc

diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc

index 6e92d182c8aa540c173f9709895f13117d0527cc..462ffddf67aab10f6a1fbf5a5428296918cc62eb 100644

--- a/content/browser/android/overscroll_controller_android.cc

+++ b/content/browser/android/overscroll_controller_android.cc

@@ -9,10 +9,10 @@

#include "base/memory/ptr_util.h"

#include "cc/layers/layer.h"

#include "cc/output/compositor_frame_metadata.h"

-#include "content/browser/android/content_view_core_impl.h"

#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/common/content_switches.h"

+#include "third_party/WebKit/public/platform/WebGestureEvent.h"

#include "third_party/WebKit/public/platform/WebInputEvent.h"

#include "ui/android/edge_effect.h"

#include "ui/android/edge_effect_l.h"

@@ -29,7 +29,6 @@ using ui::EdgeEffectL;

using ui::OverscrollGlow;

using ui::OverscrollGlowClient;

using ui::OverscrollRefresh;

-using ui::OverscrollRefreshHandler;

namespace content {

namespace {

@@ -86,25 +85,26 @@ std::unique_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client,

}

std::unique_ptr<OverscrollRefresh> CreateRefreshEffect(

- OverscrollRefreshHandler* handler) {

+ ui::OverscrollRefreshHandler* overscroll_refresh_handler) {

if (base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisablePullToRefreshEffect)) {

return nullptr;

}

- return base::MakeUnique<OverscrollRefresh>(handler);

+ return base::MakeUnique<OverscrollRefresh>(overscroll_refresh_handler);

}

} // namespace

OverscrollControllerAndroid::OverscrollControllerAndroid(

- ContentViewCoreImpl* content_view_core,

+ ui::OverscrollRefreshHandler* overscroll_refresh_handler,

+ ui::WindowAndroidCompositor* compositor,

float dpi_scale)

- : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()),

+ : compositor_(compositor),

dpi_scale_(dpi_scale),

enabled_(true),

glow_effect_(CreateGlowEffect(this, dpi_scale_)),

- refresh_effect_(CreateRefreshEffect(content_view_core)) {

+ refresh_effect_(CreateRefreshEffect(overscroll_refresh_handler)) {

DCHECK(compositor_);

boliu 2016/12/06 16:06:45 interesting, so looks like this DCHECK is failing

rlanday 2016/12/06 19:01:16 Ok, I'll look into this

rlanday 2016/12/06 21:26:28 I'm actually not sure anything is hitting the DCHE

}