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

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 879993004: Remove ScrollableArea and Scrollbar (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/frame/Settings.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 8883ffac5b4cb7b050ba51be755f1e29fe3caf0e..d9fce728eda4182a8e9d3910bfe19f0ac13723a8 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -52,8 +52,6 @@
#include "sky/engine/platform/fonts/FontCache.h"
#include "sky/engine/platform/geometry/FloatRect.h"
#include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/scroll/ScrollAnimator.h"
-#include "sky/engine/platform/scroll/Scrollbar.h"
#include "sky/engine/platform/text/TextStream.h"
#include "sky/engine/wtf/CurrentTime.h"
#include "sky/engine/wtf/TemporaryChange.h"
@@ -714,9 +712,6 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
rootLayer->paint(p, rect, renderer);
- if (rootLayer->containsDirtyOverlayScrollbars())
- rootLayer->paintOverlayScrollbars(p, rect, renderer);
-
m_isPainting = false;
m_lastPaintTime = currentTime();
@@ -810,21 +805,6 @@ IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoi
return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
}
-void FrameView::addScrollableArea(ScrollableArea* scrollableArea)
-{
- ASSERT(scrollableArea);
- if (!m_scrollableAreas)
- m_scrollableAreas = adoptPtr(new ScrollableAreaSet);
- m_scrollableAreas->add(scrollableArea);
-}
-
-void FrameView::removeScrollableArea(ScrollableArea* scrollableArea)
-{
- if (!m_scrollableAreas)
- return;
- m_scrollableAreas->remove(scrollableArea);
-}
-
bool FrameView::isVerticalDocument() const
{
// FIXME(sky): Remove
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/frame/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698