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

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

Issue 1435233002: Remove invert viewport scroll order setting from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix after rebase Created 4 years, 11 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
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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 } else if (wasResized) { 771 } else if (wasResized) {
772 document->evaluateMediaQueryList(); 772 document->evaluateMediaQueryList();
773 } 773 }
774 774
775 document->updateLayoutTreeIfNeeded(); 775 document->updateLayoutTreeIfNeeded();
776 lifecycle().advanceTo(DocumentLifecycle::StyleClean); 776 lifecycle().advanceTo(DocumentLifecycle::StyleClean);
777 777
778 if (m_frame->isMainFrame() && !m_viewportScrollableArea) { 778 if (m_frame->isMainFrame() && !m_viewportScrollableArea) {
779 ScrollableArea& visualViewport = m_frame->host()->visualViewport(); 779 ScrollableArea& visualViewport = m_frame->host()->visualViewport();
780 ScrollableArea* layoutViewport = layoutViewportScrollableArea(); 780 ScrollableArea* layoutViewport = layoutViewportScrollableArea();
781 bool invertScrollOrder = m_frame->settings()->invertViewportScrollOrder( );
782 ASSERT(layoutViewport); 781 ASSERT(layoutViewport);
783 m_viewportScrollableArea = RootFrameViewport::create(visualViewport, *la youtViewport, invertScrollOrder); 782 m_viewportScrollableArea = RootFrameViewport::create(visualViewport, *la youtViewport);
784 } 783 }
785 } 784 }
786 785
787 static inline void layoutFromRootObject(LayoutObject& root) 786 static inline void layoutFromRootObject(LayoutObject& root)
788 { 787 {
789 LayoutState layoutState(root); 788 LayoutState layoutState(root);
790 root.layout(); 789 root.layout();
791 } 790 }
792 791
793 void FrameView::prepareLayoutAnalyzer() 792 void FrameView::prepareLayoutAnalyzer()
(...skipping 3223 matching lines...) Expand 10 before | Expand all | Expand 10 after
4017 return m_hiddenForThrottling && m_crossOriginForThrottling; 4016 return m_hiddenForThrottling && m_crossOriginForThrottling;
4018 } 4017 }
4019 4018
4020 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4019 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4021 { 4020 {
4022 ASSERT(layoutView()); 4021 ASSERT(layoutView());
4023 return *layoutView(); 4022 return *layoutView();
4024 } 4023 }
4025 4024
4026 } // namespace blink 4025 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698