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

Unified Diff: Source/WebCore/platform/ScrollView.cpp

Issue 13818029: Remove TiledBacking / TileCache code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 7 years, 8 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 | « Source/WebCore/platform/ScrollView.h ('k') | Source/WebCore/platform/ScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/ScrollView.cpp
diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
index 0107201f272f40794abf0c752b2e9356a489c816..d6b82049717d95858526ca956daf1ec61f0ecbe7 100644
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -56,7 +56,6 @@ ScrollView::ScrollView()
, m_useFixedLayout(false)
, m_paintsEntireContents(false)
, m_clipsRepaints(true)
- , m_delegatesScrolling(false)
{
platformInit();
}
@@ -195,15 +194,6 @@ void ScrollView::setClipsRepaints(bool clipsRepaints)
m_clipsRepaints = clipsRepaints;
}
-void ScrollView::setDelegatesScrolling(bool delegatesScrolling)
-{
- if (m_delegatesScrolling == delegatesScrolling)
- return;
-
- m_delegatesScrolling = delegatesScrolling;
- delegatesScrollingDidChange();
-}
-
IntSize ScrollView::unscaledVisibleContentSize(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
{
if (!m_fixedVisibleContentRect.isEmpty())
@@ -346,12 +336,6 @@ void ScrollView::scrollTo(const IntSize& newOffset)
if (scrollbarsSuppressed())
return;
-#if USE(TILED_BACKING_STORE)
- if (delegatesScrolling()) {
- hostWindow()->delegatedScrollRequested(IntPoint(newOffset));
- return;
- }
-#endif
repaintFixedElementsAfterScrolling();
scrollContents(scrollDelta);
updateFixedElementsAfterScrolling();
@@ -371,13 +355,6 @@ void ScrollView::setScrollPosition(const IntPoint& scrollPoint)
if (prohibitsScrolling())
return;
-#if USE(TILED_BACKING_STORE)
- if (delegatesScrolling()) {
- hostWindow()->delegatedScrollRequested(scrollPoint);
- return;
- }
-#endif
-
IntPoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint);
if (newScrollPosition == scrollPosition())
@@ -684,9 +661,6 @@ IntRect ScrollView::contentsToRootView(const IntRect& contentsRect) const
IntPoint ScrollView::windowToContents(const IntPoint& windowPoint) const
{
- if (delegatesScrolling())
- return convertFromContainingWindow(windowPoint);
-
IntPoint viewPoint = convertFromContainingWindow(windowPoint);
IntSize offsetInDocument = scrollOffset() - IntSize(0, headerHeight());
return viewPoint + offsetInDocument;
@@ -694,9 +668,6 @@ IntPoint ScrollView::windowToContents(const IntPoint& windowPoint) const
IntPoint ScrollView::contentsToWindow(const IntPoint& contentsPoint) const
{
- if (delegatesScrolling())
- return convertToContainingWindow(contentsPoint);
-
IntSize offsetInDocument = scrollOffset() + IntSize(0, headerHeight());
IntPoint viewPoint = contentsPoint - offsetInDocument;
return convertToContainingWindow(viewPoint);
@@ -704,9 +675,6 @@ IntPoint ScrollView::contentsToWindow(const IntPoint& contentsPoint) const
IntRect ScrollView::windowToContents(const IntRect& windowRect) const
{
- if (delegatesScrolling())
- return convertFromContainingWindow(windowRect);
-
IntRect viewRect = convertFromContainingWindow(windowRect);
IntSize offsetInDocument = scrollOffset() - IntSize(0, headerHeight());
viewRect.move(offsetInDocument);
@@ -715,9 +683,6 @@ IntRect ScrollView::windowToContents(const IntRect& windowRect) const
IntRect ScrollView::contentsToWindow(const IntRect& contentsRect) const
{
- if (delegatesScrolling())
- return convertToContainingWindow(contentsRect);
-
IntRect viewRect = contentsRect;
viewRect.move(-scrollOffset() + IntSize(0, headerHeight()));
return convertToContainingWindow(viewRect);
« no previous file with comments | « Source/WebCore/platform/ScrollView.h ('k') | Source/WebCore/platform/ScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698