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

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

Issue 2531603003: Only scroll on main if the targeted frames need to scroll on main (Closed)
Patch Set: Bug fixed Created 4 years 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
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 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 if (layoutView.isNull()) 818 if (layoutView.isNull())
819 return false; 819 return false;
820 if (m_frame->settings() && 820 if (m_frame->settings() &&
821 m_frame->settings()->preferCompositingToLCDTextEnabled()) 821 m_frame->settings()->preferCompositingToLCDTextEnabled())
822 return layoutView.compositor()->inCompositingMode(); 822 return layoutView.compositor()->inCompositingMode();
823 return false; 823 return false;
824 } 824 }
825 825
826 bool FrameView::shouldScrollOnMainThread() const { 826 bool FrameView::shouldScrollOnMainThread() const {
827 if (ScrollingCoordinator* sc = scrollingCoordinator()) { 827 if (ScrollingCoordinator* sc = scrollingCoordinator()) {
828 if (sc->shouldUpdateScrollLayerPositionOnMainThread()) 828 if (sc->shouldUpdateScrollLayerPositionOnMainThread(m_frame))
829 return true; 829 return true;
830 } 830 }
831 return ScrollableArea::shouldScrollOnMainThread(); 831 return ScrollableArea::shouldScrollOnMainThread();
832 } 832 }
833 833
834 GraphicsLayer* FrameView::layerForScrolling() const { 834 GraphicsLayer* FrameView::layerForScrolling() const {
835 LayoutViewItem layoutView = this->layoutViewItem(); 835 LayoutViewItem layoutView = this->layoutViewItem();
836 if (layoutView.isNull()) 836 if (layoutView.isNull())
837 return nullptr; 837 return nullptr;
838 return layoutView.compositor()->frameScrollLayer(); 838 return layoutView.compositor()->frameScrollLayer();
(...skipping 3836 matching lines...) Expand 10 before | Expand all | Expand 10 after
4675 DCHECK(m_frame->isMainFrame()); 4675 DCHECK(m_frame->isMainFrame());
4676 return m_initialViewportSize.width(); 4676 return m_initialViewportSize.width();
4677 } 4677 }
4678 4678
4679 int FrameView::initialViewportHeight() const { 4679 int FrameView::initialViewportHeight() const {
4680 DCHECK(m_frame->isMainFrame()); 4680 DCHECK(m_frame->isMainFrame());
4681 return m_initialViewportSize.height(); 4681 return m_initialViewportSize.height();
4682 } 4682 }
4683 4683
4684 } // namespace blink 4684 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698