Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: content/browser/web_contents/aura/overscroll_navigation_overlay.h

Issue 202183003: Fixing race conditions in ui::content::WindowSlider which could cause the overscroll overlay to nev… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/browser/web_contents/aura/window_slider.h" 10 #include "content/browser/web_contents/aura/window_slider.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void StopObservingIfDone(); 74 void StopObservingIfDone();
75 75
76 // Creates a layer to be used for window-slide. |offset| is the offset of the 76 // Creates a layer to be used for window-slide. |offset| is the offset of the
77 // NavigationEntry for the screenshot image to display. 77 // NavigationEntry for the screenshot image to display.
78 ui::Layer* CreateSlideLayer(int offset); 78 ui::Layer* CreateSlideLayer(int offset);
79 79
80 // IPC message callbacks. 80 // IPC message callbacks.
81 void OnUpdateRect(const ViewHostMsg_UpdateRect_Params& params); 81 void OnUpdateRect(const ViewHostMsg_UpdateRect_Params& params);
82 82
83 // Overridden from WindowSlider::Delegate: 83 // Overridden from WindowSlider::Delegate:
84 virtual ui::Layer* CreateBackLayer() OVERRIDE; 84 virtual ui::Layer* OnSlideBackStartedCreateLayer() OVERRIDE;
85 virtual ui::Layer* CreateFrontLayer() OVERRIDE; 85 virtual ui::Layer* OnSlideForwardStartedCreateLayer() OVERRIDE;
86 virtual void OnWindowSlideComplete() OVERRIDE; 86 virtual void OnWindowFlingStarted() OVERRIDE;
87 virtual void OnWindowFlingCompleted() OVERRIDE;
87 virtual void OnWindowSlideAborted() OVERRIDE; 88 virtual void OnWindowSlideAborted() OVERRIDE;
88 virtual void OnWindowSliderDestroyed() OVERRIDE; 89 virtual void OnWindowSliderDestroyed() OVERRIDE;
89 90
90 // Overridden from WebContentsObserver: 91 // Overridden from WebContentsObserver:
91 virtual void DocumentOnLoadCompletedInMainFrame(int32 page_id) OVERRIDE; 92 virtual void DocumentOnLoadCompletedInMainFrame(int32 page_id) OVERRIDE;
92 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; 93 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE;
93 virtual void DidStopLoading(RenderViewHost* host) OVERRIDE; 94 virtual void DidStopLoading(RenderViewHost* host) OVERRIDE;
94 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 95 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
95 96
96 // The WebContents which is being navigated. 97 // The WebContents which is being navigated.
(...skipping 28 matching lines...) Expand all
125 // container keeps waiting for a paint update it never receives, causing a 126 // container keeps waiting for a paint update it never receives, causing a
126 // timeout. So during tests, disable the wait for paint updates. 127 // timeout. So during tests, disable the wait for paint updates.
127 bool need_paint_update_; 128 bool need_paint_update_;
128 129
129 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay); 130 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay);
130 }; 131 };
131 132
132 } // namespace content 133 } // namespace content
133 134
134 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ 135 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698