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

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

Issue 1811753003: Set m_{width,height}AvailableToChildrenChanged when scrollbars appear (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: different/better approach 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 1910 matching lines...) Expand 10 before | Expand all | Expand 10 after
1921 offset = flipForWritingMode(offset); 1921 offset = flipForWritingMode(offset);
1922 } 1922 }
1923 1923
1924 int LayoutBlock::columnGap() const 1924 int LayoutBlock::columnGap() const
1925 { 1925 {
1926 if (style()->hasNormalColumnGap()) 1926 if (style()->hasNormalColumnGap())
1927 return style()->getFontDescription().computedPixelSize(); // "1em" is re commended as the normal gap setting. Matches <p> margins. 1927 return style()->getFontDescription().computedPixelSize(); // "1em" is re commended as the normal gap setting. Matches <p> margins.
1928 return static_cast<int>(style()->columnGap()); 1928 return static_cast<int>(style()->columnGap());
1929 } 1929 }
1930 1930
1931 void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, bool vertic alScrollbarChanged)
1932 {
1933 m_widthAvailableToChildrenChanged |= horizontalScrollbarChanged;
1934 m_heightAvailableToChildrenChanged |= verticalScrollbarChanged;
1935 }
1936
1931 void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const 1937 void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const
1932 { 1938 {
1933 // Layout-contained elements don't consider their contents for preferred siz ing. 1939 // Layout-contained elements don't consider their contents for preferred siz ing.
1934 if (style()->containsLayout()) 1940 if (style()->containsLayout())
1935 return; 1941 return;
1936 1942
1937 if (childrenInline()) { 1943 if (childrenInline()) {
1938 // FIXME: Remove this const_cast. 1944 // FIXME: Remove this const_cast.
1939 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth); 1945 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth);
1940 } else { 1946 } else {
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
2864 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2870 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2865 { 2871 {
2866 showLayoutObject(); 2872 showLayoutObject();
2867 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2873 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2868 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2874 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2869 } 2875 }
2870 2876
2871 #endif 2877 #endif
2872 2878
2873 } // namespace blink 2879 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698