| Index: content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| index 1a17d9056ac6b4976259fc5013f0342564766d16..c873dd76a1fa3523749451b08df456581c9be1e5 100644
|
| --- a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| +++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc
|
| @@ -112,7 +112,6 @@ OverscrollNavigationOverlay::OverscrollNavigationOverlay(
|
| WebContentsImpl* web_contents)
|
| : web_contents_(web_contents),
|
| image_delegate_(NULL),
|
| - loading_complete_(false),
|
| received_paint_update_(false),
|
| pending_entry_id_(0),
|
| slide_direction_(SLIDE_UNKNOWN),
|
| @@ -123,7 +122,6 @@ OverscrollNavigationOverlay::~OverscrollNavigationOverlay() {
|
| }
|
|
|
| void OverscrollNavigationOverlay::StartObserving() {
|
| - loading_complete_ = false;
|
| received_paint_update_ = false;
|
| pending_entry_id_ = 0;
|
| Observe(web_contents_);
|
| @@ -208,22 +206,6 @@ ui::Layer* OverscrollNavigationOverlay::CreateSlideLayer(int offset) {
|
| return layer;
|
| }
|
|
|
| -void OverscrollNavigationOverlay::OnUpdateRect(
|
| - const ViewHostMsg_UpdateRect_Params& params) {
|
| - if (loading_complete_ &&
|
| - ViewHostMsg_UpdateRect_Flags::is_repaint_ack(params.flags)) {
|
| - NavigationEntry* visible_entry =
|
| - web_contents_->GetController().GetVisibleEntry();
|
| - int visible_entry_id = visible_entry ? visible_entry->GetUniqueID() : 0;
|
| - if (visible_entry_id == pending_entry_id_ || !pending_entry_id_) {
|
| - // This is a paint update after the page has been loaded. So do not wait
|
| - // for a 'first non-empty' paint update.
|
| - received_paint_update_ = true;
|
| - StopObservingIfDone();
|
| - }
|
| - }
|
| -}
|
| -
|
| ui::Layer* OverscrollNavigationOverlay::CreateBackLayer() {
|
| if (!web_contents_->GetController().CanGoBack())
|
| return NULL;
|
| @@ -301,18 +283,6 @@ void OverscrollNavigationOverlay::OnWindowSliderDestroyed() {
|
| }
|
| }
|
|
|
| -void OverscrollNavigationOverlay::DocumentOnLoadCompletedInMainFrame() {
|
| - // Use the last committed entry rather than the active one, in case a
|
| - // pending entry has been created.
|
| - int committed_entry_id =
|
| - web_contents_->GetController().GetLastCommittedEntry()->GetUniqueID();
|
| - // Consider the loading completed once the main frame has loaded.
|
| - if (committed_entry_id == pending_entry_id_ || !pending_entry_id_) {
|
| - loading_complete_ = true;
|
| - StopObservingIfDone();
|
| - }
|
| -}
|
| -
|
| void OverscrollNavigationOverlay::DidFirstVisuallyNonEmptyPaint() {
|
| int visible_entry_id =
|
| web_contents_->GetController().GetVisibleEntry()->GetUniqueID();
|
| @@ -322,29 +292,4 @@ void OverscrollNavigationOverlay::DidFirstVisuallyNonEmptyPaint() {
|
| }
|
| }
|
|
|
| -void OverscrollNavigationOverlay::DidStopLoading(RenderViewHost* host) {
|
| - // Use the last committed entry rather than the active one, in case a
|
| - // pending entry has been created.
|
| - int committed_entry_id =
|
| - web_contents_->GetController().GetLastCommittedEntry()->GetUniqueID();
|
| - if (committed_entry_id == pending_entry_id_ || !pending_entry_id_) {
|
| - loading_complete_ = true;
|
| - if (!received_paint_update_ && need_paint_update_) {
|
| - // Force a repaint after the page is loaded.
|
| - RenderViewHostImpl* view = static_cast<RenderViewHostImpl*>(host);
|
| - view->ScheduleComposite();
|
| - }
|
| - StopObservingIfDone();
|
| - }
|
| -}
|
| -
|
| -bool OverscrollNavigationOverlay::OnMessageReceived(
|
| - const IPC::Message& message) {
|
| - CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - IPC_BEGIN_MESSAGE_MAP(OverscrollNavigationOverlay, message)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect)
|
| - IPC_END_MESSAGE_MAP()
|
| - return false;
|
| -}
|
| -
|
| } // namespace content
|
|
|