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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 687783003: More cleanup of dead code now that we don't have frame-level scrolling. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/UseCounter.h » ('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 92d5ced24ca6c6a4766bb706d59850d7680f5865..217a65608585bba97995a7e97f264e1fe5bb979e 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -72,7 +72,6 @@ static const double resourcePriorityUpdateDelayAfterScroll = 0.250;
FrameView::FrameView(LocalFrame* frame)
: m_frame(frame)
- , m_canHaveScrollbars(true)
, m_hasPendingLayout(false)
, m_layoutSubtreeRoot(0)
, m_inSynchronousPostLayout(false)
@@ -161,11 +160,6 @@ void FrameView::prepareForDetach()
// FIXME(sky): Remove
}
-void FrameView::recalculateScrollbarOverlayStyle()
-{
- // FIXME(sky): Remove.
-}
-
void FrameView::clear()
{
reset();
@@ -224,72 +218,6 @@ IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) cons
return clampedOffset;
}
-void FrameView::applyOverflowToViewportAndSetRenderer(RenderObject* o, ScrollbarMode& hMode, ScrollbarMode& vMode)
-{
- // Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats
- // overflow:hidden and overflow:scroll on <body> as applying to the document's
- // scrollbars. The CSS2.1 draft states that HTML UAs should use the <html> or <body> element and XML/XHTML UAs should
- // use the root element.
-
- EOverflow overflowX = o->style()->overflowX();
- EOverflow overflowY = o->style()->overflowY();
-
- switch (overflowX) {
- case OHIDDEN:
- hMode = ScrollbarAlwaysOff;
- break;
- case OSCROLL:
- hMode = ScrollbarAlwaysOn;
- break;
- case OAUTO:
- hMode = ScrollbarAuto;
- break;
- default:
- // Don't set it at all.
- ;
- }
-
- switch (overflowY) {
- case OHIDDEN:
- vMode = ScrollbarAlwaysOff;
- break;
- case OSCROLL:
- vMode = ScrollbarAlwaysOn;
- break;
- case OAUTO:
- vMode = ScrollbarAuto;
- break;
- default:
- // Don't set it at all.
- ;
- }
-
- m_viewportRenderer = o;
-}
-
-void FrameView::calculateScrollbarModesForLayoutAndSetViewportRenderer(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy strategy)
-{
- m_viewportRenderer = 0;
-
- if (m_canHaveScrollbars || strategy == RulesFromWebContentOnly) {
- hMode = ScrollbarAuto;
- vMode = ScrollbarAuto;
- } else {
- hMode = ScrollbarAlwaysOff;
- vMode = ScrollbarAlwaysOff;
- }
-
- if (!isSubtreeLayout()) {
- Document* document = m_frame->document();
- if (Element* viewportElement = document->viewportDefiningElement()) {
- if (RenderObject* viewportRenderer = viewportElement->renderer()) {
- if (viewportRenderer->style())
- applyOverflowToViewportAndSetRenderer(viewportRenderer, hMode, vMode);
- }
- }
- }
-}
-
void FrameView::updateAcceleratedCompositingSettings()
{
if (RenderView* renderView = this->renderView())
@@ -550,11 +478,6 @@ void FrameView::layout(bool allowSubtree)
ASSERT(!rootForThisLayout->needsLayout());
- if (document->hasListenerType(Document::OVERFLOWCHANGED_LISTENER)) {
- updateOverflowStatus(layoutSize().width() < width(),
- layoutSize().height() < height());
- }
-
scheduleOrPerformPostLayoutTasks();
TRACE_EVENT_END1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Layout", "endData", InspectorLayoutEvent::endData(rootForThisLayout));
@@ -663,43 +586,12 @@ bool FrameView::contentsInCompositedLayer() const
return false;
}
-IntPoint FrameView::lastKnownMousePosition() const
-{
- return m_frame->eventHandler().lastKnownMousePosition();
-}
-
bool FrameView::shouldSetCursor() const
{
Page* page = frame().page();
return page && page->visibilityState() != PageVisibilityStateHidden && page->focusController().isActive() && page->settings().deviceSupportsMouse();
}
-void FrameView::scrollContentsIfNeededRecursive()
-{
- // FIXME(sky): Remove
-}
-
-void FrameView::scrollContentsIfNeeded()
-{
- // FIXME(sky): Remove
-}
-
-bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta)
-{
- // FIXME(sky): Remove
- return false;
-}
-
-void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
-{
- // FIXME(sky): Remove
-}
-
-void FrameView::restoreScrollbar()
-{
- // FIXME(sky): Remove
-}
-
// FIXME(sky): remove
IntSize FrameView::layoutSize(IncludeScrollbarsInRect) const
{
@@ -793,19 +685,6 @@ void FrameView::contentsResized()
setNeedsLayout();
}
-void FrameView::scrollbarExistenceDidChange()
-{
- // We check to make sure the view is attached to a frame() as this method can
- // be triggered before the view is attached by LocalFrame::createView(...) setting
- // various values such as setScrollBarModes(...) for example. An ASSERT is
- // triggered when a view is layout before being attached to a frame().
- if (!frame().view())
- return;
-
- if (renderView() && renderView()->usesCompositing())
- renderView()->compositor()->frameViewScrollbarsExistenceDidChange();
-}
-
void FrameView::scheduleRelayout()
{
ASSERT(m_frame->view() == this);
@@ -949,7 +828,6 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
if (compositedLayerMapping->mainGraphicsLayer())
compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();
}
- recalculateScrollbarOverlayStyle();
}
void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool transparent)
@@ -1033,19 +911,6 @@ void FrameView::postLayoutTimerFired(Timer<FrameView>*)
performPostLayoutTasks();
}
-void FrameView::updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow)
-{
- if (!m_viewportRenderer)
- return;
-
- if (m_overflowStatusDirty) {
- m_horizontalOverflow = horizontalOverflow;
- m_verticalOverflow = verticalOverflow;
- m_overflowStatusDirty = false;
- return;
- }
-}
-
IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) const
{
ASSERT(m_frame->view() == this);
@@ -1064,11 +929,6 @@ bool FrameView::isActive() const
return page && page->focusController().isActive();
}
-void FrameView::invalidateScrollbarRect(Scrollbar*, const IntRect&)
-{
- // FIXME(sky): remove
-}
-
void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const
{
if (!m_tickmarks.isEmpty())
@@ -1106,12 +966,6 @@ IntRect FrameView::scrollableAreaBoundingBox() const
return frameRect();
}
-bool FrameView::isScrollable()
-{
- // FIXME(sky): Remove
- return false;
-}
-
bool FrameView::scrollAnimatorEnabled() const
{
return m_frame->settings() && m_frame->settings()->scrollAnimatorEnabled();
@@ -1264,7 +1118,6 @@ void FrameView::updateLayoutAndStyleForPainting()
invalidateTreeIfNeededRecursive();
}
- scrollContentsIfNeededRecursive();
ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
}
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698