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

Unified Diff: sky/engine/web/WebViewImpl.cpp

Issue 646273006: Get rid of ScrollView. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT 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
Index: sky/engine/web/WebViewImpl.cpp
diff --git a/sky/engine/web/WebViewImpl.cpp b/sky/engine/web/WebViewImpl.cpp
index 1c815bc3e753cb620e3b06845c33be73b6e80630..ee8a6bf4ba1475616c1bf9cfacac4a6662f48869 100644
--- a/sky/engine/web/WebViewImpl.cpp
+++ b/sky/engine/web/WebViewImpl.cpp
@@ -934,8 +934,7 @@ void WebViewImpl::close()
void WebViewImpl::willStartLiveResize()
{
- if (mainFrameImpl() && mainFrameImpl()->frameView())
- mainFrameImpl()->frameView()->willStartLiveResize();
+ // FIXME(sky): Remove
}
WebSize WebViewImpl::size()
@@ -987,8 +986,7 @@ void WebViewImpl::resize(const WebSize& newSize)
void WebViewImpl::willEndLiveResize()
{
- if (mainFrameImpl() && mainFrameImpl()->frameView())
- mainFrameImpl()->frameView()->willEndLiveResize();
+ // FIXME(sky): Remove
}
void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime)
@@ -1108,12 +1106,14 @@ void WebViewImpl::clearCompositedSelectionBounds()
bool WebViewImpl::hasHorizontalScrollbar()
{
- return mainFrameImpl()->frameView()->horizontalScrollbar();
+ // FIXME(sky): Remove
+ return false;
}
bool WebViewImpl::hasVerticalScrollbar()
{
- return mainFrameImpl()->frameView()->verticalScrollbar();
+ // FIXME(sky): Remove
+ return false;
}
const WebInputEvent* WebViewImpl::m_currentInputEvent = 0;
@@ -1942,14 +1942,7 @@ WebSize WebViewImpl::contentsPreferredMinimumSize()
void WebViewImpl::resetScrollAndScaleState()
{
- // TODO: This is done by the pinchViewport().reset() call below and can be removed when
- // the new pinch path is the only one.
- updateMainFrameScrollPosition(IntPoint(), true);
- page()->frameHost().pinchViewport().reset();
-
- // Clobber saved scales and scroll offsets.
- if (FrameView* view = page()->mainFrame()->document()->view())
- view->cacheCurrentScrollPosition();
+ // FIXME(sky): Remove
}
void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
@@ -2452,23 +2445,11 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneckRects);
m_layerTreeView->heuristicsForGpuRasterizationUpdated(m_matchesHeuristicsForGpuRasterization);
}
- if (page())
- page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
}
void WebViewImpl::updateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll)
{
- FrameView* frameView = page()->mainFrame()->view();
- if (!frameView)
- return;
-
- if (frameView->scrollPosition() == scrollPosition)
- return;
-
- bool oldProgrammaticScroll = frameView->inProgrammaticScroll();
- frameView->setInProgrammaticScroll(programmaticScroll);
- frameView->notifyScrollPositionChanged(scrollPosition);
- frameView->setInProgrammaticScroll(oldProgrammaticScroll);
+ // FIXME(sky): Remove
}
void WebViewImpl::applyScrollAndScale(const WebSize& scrollDelta, float pageScaleDelta)

Powered by Google App Engine
This is Rietveld 408576698