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

Unified Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 621653002: Don't call into ScrollView from Scrollbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@resizer
Patch Set: Created 6 years, 3 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 | « no previous file | Source/platform/scroll/ScrollView.h » ('j') | Source/platform/scroll/ScrollView.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
index d5ba03a633bf3881c315a8f3d19516e7f4c4015f..b9eef7f2d72736bac2d9046fd0630279e0a89d2e 100644
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
@@ -880,7 +880,7 @@ void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientatio
if (!scrollbar->isCustomScrollbar())
willRemoveScrollbar(scrollbar.get(), orientation);
- scrollbar->removeFromParent();
+ toScrollView(scrollbar->parent())->removeChild(scrollbar.get());
Ian Vollick 2014/10/04 01:25:44 The fact that we were in RenderLayerScrollableArea
skobes 2014/10/06 18:18:53 Yes, exactly right. :)
scrollbar->disconnectFromScrollableArea();
scrollbar = nullptr;
}
« no previous file with comments | « no previous file | Source/platform/scroll/ScrollView.h » ('j') | Source/platform/scroll/ScrollView.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698