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

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

Issue 1200103006: Marquee width should not change a fixed width of its container. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after
2000 { 2000 {
2001 if (childrenInline()) { 2001 if (childrenInline()) {
2002 // FIXME: Remove this const_cast. 2002 // FIXME: Remove this const_cast.
2003 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth); 2003 toLayoutBlockFlow(const_cast<LayoutBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth);
2004 } else { 2004 } else {
2005 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); 2005 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth);
2006 } 2006 }
2007 2007
2008 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); 2008 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
2009 2009
2010 if (!styleRef().autoWrap() && layer() && isHTMLMarqueeElement(node())) {
mstensho (USE GERRIT) 2015/06/23 09:33:30 What's with the layer() check? Also not sure why
changseok 2015/06/24 06:15:58 This is garbage code. This change is inspired by w
2011 AtomicString direction = toElement(node())->getAttribute(directionAttr);
mstensho (USE GERRIT) 2015/06/23 09:33:31 I think I'd like to see this logic being moved to
changseok 2015/06/24 06:15:58 OK
2012 if (direction != "down" && direction != "up")
2013 minLogicalWidth = 0;
2014 }
2015
2010 if (isTableCell()) { 2016 if (isTableCell()) {
2011 Length tableCellWidth = toLayoutTableCell(this)->styleOrColLogicalWidth( ); 2017 Length tableCellWidth = toLayoutTableCell(this)->styleOrColLogicalWidth( );
2012 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) 2018 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
2013 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value())); 2019 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value()));
2014 } 2020 }
2015 2021
2016 int scrollbarWidth = intrinsicScrollbarLogicalWidth(); 2022 int scrollbarWidth = intrinsicScrollbarLogicalWidth();
2017 maxLogicalWidth += scrollbarWidth; 2023 maxLogicalWidth += scrollbarWidth;
2018 minLogicalWidth += scrollbarWidth; 2024 minLogicalWidth += scrollbarWidth;
2019 } 2025 }
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
2917 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2923 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2918 { 2924 {
2919 showLayoutObject(); 2925 showLayoutObject();
2920 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2926 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2921 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2927 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2922 } 2928 }
2923 2929
2924 #endif 2930 #endif
2925 2931
2926 } // namespace blink 2932 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698