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

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp

Issue 2942163002: [Refactor] Moved scrollbar creation and deletion to ScrollbarManager (Closed)
Patch Set: bokan and skobes comments addressed Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
index 0eb408c2ca75d28dd60b9d0dd1f261cf87488eae..e604cac194b8006e6ac35c4ac8505ac88869cb46 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -396,6 +396,8 @@ void ScrollableArea::FinishCurrentScrollAnimations() const {
void ScrollableArea::DidAddScrollbar(Scrollbar& scrollbar,
ScrollbarOrientation orientation) {
+ if (scrollbar.IsCustomScrollbar())
+ return;
if (orientation == kVerticalScrollbar)
GetScrollAnimator().DidAddVerticalScrollbar(scrollbar);
else
@@ -408,6 +410,8 @@ void ScrollableArea::DidAddScrollbar(Scrollbar& scrollbar,
void ScrollableArea::WillRemoveScrollbar(Scrollbar& scrollbar,
ScrollbarOrientation orientation) {
+ if (scrollbar.IsCustomScrollbar())
+ return;
if (ScrollAnimatorBase* scroll_animator = ExistingScrollAnimator()) {
if (orientation == kVerticalScrollbar)
scroll_animator->WillRemoveVerticalScrollbar(scrollbar);
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698