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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 180743004: Disable FTA when max multiplier is 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebaseline. Created 6 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 | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | 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 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 bool RenderBlock::simplifiedLayout() 1638 bool RenderBlock::simplifiedLayout()
1639 { 1639 {
1640 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal ChildNeedsLayout() || selfNeedsLayout()) 1640 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal ChildNeedsLayout() || selfNeedsLayout())
1641 return false; 1641 return false;
1642 1642
1643 LayoutStateMaintainer statePusher(*this, locationOffset()); 1643 LayoutStateMaintainer statePusher(*this, locationOffset());
1644 1644
1645 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly ()) 1645 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly ())
1646 return false; 1646 return false;
1647 1647
1648 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(document(), this ); 1648 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
1649 1649
1650 // Lay out positioned descendants or objects that just need to recompute ove rflow. 1650 // Lay out positioned descendants or objects that just need to recompute ove rflow.
1651 if (needsSimplifiedNormalFlowLayout()) 1651 if (needsSimplifiedNormalFlowLayout())
1652 simplifiedNormalFlowLayout(); 1652 simplifiedNormalFlowLayout();
1653 1653
1654 // Make sure a forced break is applied after the content if we are a flow th read in a simplified layout. 1654 // Make sure a forced break is applied after the content if we are a flow th read in a simplified layout.
1655 // This ensures the size information is correctly computed for the last auto -height region receiving content. 1655 // This ensures the size information is correctly computed for the last auto -height region receiving content.
1656 if (isRenderFlowThread()) 1656 if (isRenderFlowThread())
1657 toRenderFlowThread(this)->applyBreakAfterContent(clientLogicalBottom()); 1657 toRenderFlowThread(this)->applyBreakAfterContent(clientLogicalBottom());
1658 1658
(...skipping 3359 matching lines...) Expand 10 before | Expand all | Expand 10 after
5018 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5018 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5019 { 5019 {
5020 showRenderObject(); 5020 showRenderObject();
5021 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5021 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5022 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5022 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5023 } 5023 }
5024 5024
5025 #endif 5025 #endif
5026 5026
5027 } // namespace WebCore 5027 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698