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

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

Issue 334333002: Allow form inputs to be potential cluster roots. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « LayoutTests/fast/text-autosizing/form-controls-textfield-in-span-expected.html ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 // consistent, unless they are floating or position:absolute/fixed. 151 // consistent, unless they are floating or position:absolute/fixed.
152 Node* node = renderer->generatingNode(); 152 Node* node = renderer->generatingNode();
153 if (node && !node->hasChildren()) 153 if (node && !node->hasChildren())
154 return false; 154 return false;
155 if (!renderer->isRenderBlock()) 155 if (!renderer->isRenderBlock())
156 return false; 156 return false;
157 if (renderer->isInline() && !renderer->style()->isDisplayReplacedType()) 157 if (renderer->isInline() && !renderer->style()->isDisplayReplacedType())
158 return false; 158 return false;
159 if (renderer->isListItem()) 159 if (renderer->isListItem())
160 return (renderer->isFloating() || renderer->isOutOfFlowPositioned()); 160 return (renderer->isFloating() || renderer->isOutOfFlowPositioned());
161 // Avoid creating containers for text within form input.
162 if (isNonTextAreaFormControl(renderer->parent()))
163 return false;
164 161
165 return true; 162 return true;
166 } 163 }
167 164
168 static bool isIndependentDescendant(const RenderBlock* renderer) 165 static bool isIndependentDescendant(const RenderBlock* renderer)
169 { 166 {
170 ASSERT(isPotentialClusterRoot(renderer)); 167 ASSERT(isPotentialClusterRoot(renderer));
171 168
172 RenderBlock* containingBlock = renderer->containingBlock(); 169 RenderBlock* containingBlock = renderer->containingBlock();
173 return renderer->isRenderView() 170 return renderer->isRenderView()
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo() 1124 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo()
1128 { 1125 {
1129 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) { 1126 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) {
1130 ASSERT(textAutosizer->m_updatePageInfoDeferred); 1127 ASSERT(textAutosizer->m_updatePageInfoDeferred);
1131 textAutosizer->m_updatePageInfoDeferred = false; 1128 textAutosizer->m_updatePageInfoDeferred = false;
1132 textAutosizer->updatePageInfoInAllFrames(); 1129 textAutosizer->updatePageInfoInAllFrames();
1133 } 1130 }
1134 } 1131 }
1135 1132
1136 } // namespace WebCore 1133 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/text-autosizing/form-controls-textfield-in-span-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698