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

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 fix 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 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 if (layoutView.isNull()) 806 if (layoutView.isNull())
807 return false; 807 return false;
808 if (m_frame->settings() && 808 if (m_frame->settings() &&
809 m_frame->settings()->preferCompositingToLCDTextEnabled()) 809 m_frame->settings()->preferCompositingToLCDTextEnabled())
810 return layoutView.compositor()->inCompositingMode(); 810 return layoutView.compositor()->inCompositingMode();
811 return false; 811 return false;
812 } 812 }
813 813
814 bool FrameView::shouldScrollOnMainThread() const { 814 bool FrameView::shouldScrollOnMainThread() const {
815 if (ScrollingCoordinator* sc = scrollingCoordinator()) { 815 if (ScrollingCoordinator* sc = scrollingCoordinator()) {
816 if (sc->shouldUpdateScrollLayerPositionOnMainThread()) 816 if (sc->shouldUpdateScrollLayerPositionOnMainThread(m_frame))
817 return true; 817 return true;
818 } 818 }
819 return ScrollableArea::shouldScrollOnMainThread(); 819 return ScrollableArea::shouldScrollOnMainThread();
820 } 820 }
821 821
822 GraphicsLayer* FrameView::layerForScrolling() const { 822 GraphicsLayer* FrameView::layerForScrolling() const {
823 LayoutViewItem layoutView = this->layoutViewItem(); 823 LayoutViewItem layoutView = this->layoutViewItem();
824 if (layoutView.isNull()) 824 if (layoutView.isNull())
825 return nullptr; 825 return nullptr;
826 return layoutView.compositor()->frameScrollLayer(); 826 return layoutView.compositor()->frameScrollLayer();
(...skipping 3825 matching lines...) Expand 10 before | Expand all | Expand 10 after
4652 DCHECK(m_frame->isMainFrame()); 4652 DCHECK(m_frame->isMainFrame());
4653 return m_initialViewportSize.width(); 4653 return m_initialViewportSize.width();
4654 } 4654 }
4655 4655
4656 int FrameView::initialViewportHeight() const { 4656 int FrameView::initialViewportHeight() const {
4657 DCHECK(m_frame->isMainFrame()); 4657 DCHECK(m_frame->isMainFrame());
4658 return m_initialViewportSize.height(); 4658 return m_initialViewportSize.height();
4659 } 4659 }
4660 4660
4661 } // namespace blink 4661 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698