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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1746353002: Revert of Fully (?) fix overflow: auto with delayed scroll updates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 void LayoutBlock::startDelayUpdateScrollInfo() 830 void LayoutBlock::startDelayUpdateScrollInfo()
831 { 831 {
832 if (gDelayUpdateScrollInfo == 0) { 832 if (gDelayUpdateScrollInfo == 0) {
833 ASSERT(!gDelayedUpdateScrollInfoSet); 833 ASSERT(!gDelayedUpdateScrollInfoSet);
834 gDelayedUpdateScrollInfoSet = new DelayedUpdateScrollInfoSet; 834 gDelayedUpdateScrollInfoSet = new DelayedUpdateScrollInfoSet;
835 } 835 }
836 ASSERT(gDelayedUpdateScrollInfoSet); 836 ASSERT(gDelayedUpdateScrollInfoSet);
837 ++gDelayUpdateScrollInfo; 837 ++gDelayUpdateScrollInfo;
838 } 838 }
839 839
840 bool LayoutBlock::finishDelayUpdateScrollInfo(SubtreeLayoutScope* layoutScope) 840 void LayoutBlock::finishDelayUpdateScrollInfo()
841 { 841 {
842 bool childrenMarkedForRelayout = false;
843
844 --gDelayUpdateScrollInfo; 842 --gDelayUpdateScrollInfo;
845 ASSERT(gDelayUpdateScrollInfo >= 0); 843 ASSERT(gDelayUpdateScrollInfo >= 0);
846 if (gDelayUpdateScrollInfo == 0) { 844 if (gDelayUpdateScrollInfo == 0) {
847 ASSERT(gDelayedUpdateScrollInfoSet); 845 ASSERT(gDelayedUpdateScrollInfoSet);
848 846
849 OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScroll InfoSet)); 847 OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScroll InfoSet));
850 gDelayedUpdateScrollInfoSet = nullptr; 848 gDelayedUpdateScrollInfoSet = nullptr;
851 849
852 for (auto* block : *infoSet) { 850 for (auto* block : *infoSet) {
853 if (block->hasOverflowClip()) { 851 if (block->hasOverflowClip()) {
854 childrenMarkedForRelayout |= block->layer()->scrollableArea()->u pdateAfterLayout(layoutScope); 852 block->layer()->scrollableArea()->updateAfterLayout();
855 } 853 }
856 } 854 }
857 } 855 }
858 return childrenMarkedForRelayout;
859 } 856 }
860 857
861 void LayoutBlock::updateScrollInfoAfterLayout() 858 void LayoutBlock::updateScrollInfoAfterLayout()
862 { 859 {
863 if (hasOverflowClip()) { 860 if (hasOverflowClip()) {
864 if (style()->isFlippedBlocksWritingMode()) { 861 if (style()->isFlippedBlocksWritingMode()) {
865 // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937 862 // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937
866 // Workaround for now. We cannot delay the scroll info for overflow 863 // Workaround for now. We cannot delay the scroll info for overflow
867 // for items with opposite writing directions, as the contents needs 864 // for items with opposite writing directions, as the contents needs
868 // to overflow in that direction 865 // to overflow in that direction
(...skipping 1996 matching lines...) Expand 10 before | Expand all | Expand 10 after
2865 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2862 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2866 { 2863 {
2867 showLayoutObject(); 2864 showLayoutObject();
2868 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2865 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2869 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2866 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2870 } 2867 }
2871 2868
2872 #endif 2869 #endif
2873 2870
2874 } // namespace blink 2871 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698