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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/VisualViewport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 bool FrameView::usesCompositedScrolling() const 669 bool FrameView::usesCompositedScrolling() const
670 { 670 {
671 LayoutView* layoutView = this->layoutView(); 671 LayoutView* layoutView = this->layoutView();
672 if (!layoutView) 672 if (!layoutView)
673 return false; 673 return false;
674 if (m_frame->settings() && m_frame->settings()->preferCompositingToLCDTextEn abled()) 674 if (m_frame->settings() && m_frame->settings()->preferCompositingToLCDTextEn abled())
675 return layoutView->compositor()->inCompositingMode(); 675 return layoutView->compositor()->inCompositingMode();
676 return false; 676 return false;
677 } 677 }
678 678
679 GraphicsLayer* FrameView::layerForScrollbarContainer() const
680 {
681 if (m_frame->isMainFrame())
682 return page()->frameHost().visualViewport().layerForScrollbarContainer() ;
683 return layerForContainer();
684 }
685
686 GraphicsLayer* FrameView::layerForScrolling() const 679 GraphicsLayer* FrameView::layerForScrolling() const
687 { 680 {
688 LayoutView* layoutView = this->layoutView(); 681 LayoutView* layoutView = this->layoutView();
689 if (!layoutView) 682 if (!layoutView)
690 return nullptr; 683 return nullptr;
691 return layoutView->compositor()->frameScrollLayer(); 684 return layoutView->compositor()->frameScrollLayer();
692 } 685 }
693 686
694 GraphicsLayer* FrameView::layerForHorizontalScrollbar() const 687 GraphicsLayer* FrameView::layerForHorizontalScrollbar() const
695 { 688 {
(...skipping 3269 matching lines...) Expand 10 before | Expand all | Expand 10 after
3965 3958
3966 if (!graphicsLayer) 3959 if (!graphicsLayer)
3967 return; 3960 return;
3968 3961
3969 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 3962 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
3970 3963
3971 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3964 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3972 } 3965 }
3973 3966
3974 } // namespace blink 3967 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/VisualViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698