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

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

Issue 1818123003: Mixed up vertical and horizontal :( (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
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
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 1916
1917 int LayoutBlock::columnGap() const 1917 int LayoutBlock::columnGap() const
1918 { 1918 {
1919 if (style()->hasNormalColumnGap()) 1919 if (style()->hasNormalColumnGap())
1920 return style()->fontDescription().computedPixelSize(); // "1em" is recom mended as the normal gap setting. Matches <p> margins. 1920 return style()->fontDescription().computedPixelSize(); // "1em" is recom mended as the normal gap setting. Matches <p> margins.
1921 return static_cast<int>(style()->columnGap()); 1921 return static_cast<int>(style()->columnGap());
1922 } 1922 }
1923 1923
1924 void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, bool vertic alScrollbarChanged) 1924 void LayoutBlock::scrollbarsChanged(bool horizontalScrollbarChanged, bool vertic alScrollbarChanged)
1925 { 1925 {
1926 m_widthAvailableToChildrenChanged |= horizontalScrollbarChanged; 1926 m_widthAvailableToChildrenChanged |= verticalScrollbarChanged;
1927 m_heightAvailableToChildrenChanged |= verticalScrollbarChanged; 1927 m_heightAvailableToChildrenChanged |= horizontalScrollbarChanged;
1928 } 1928 }
1929 1929
1930 void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const 1930 void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const
1931 { 1931 {
1932 if (childrenInline()) { 1932 if (childrenInline()) {
1933 // FIXME: Remove this const_cast. 1933 // FIXME: Remove this const_cast.
1934 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth); 1934 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth);
1935 } else { 1935 } else {
1936 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); 1936 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth);
1937 } 1937 }
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
2871 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2871 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2872 { 2872 {
2873 showLayoutObject(); 2873 showLayoutObject();
2874 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2874 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2875 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2875 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2876 } 2876 }
2877 2877
2878 #endif 2878 #endif
2879 2879
2880 } // namespace blink 2880 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698