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

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

Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat. (Closed)
Patch Set: merge with master; thakis nit Created 4 years, 2 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) 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 281
282 static bool hasExplicitWidth(const LayoutBlock* block) { 282 static bool hasExplicitWidth(const LayoutBlock* block) {
283 // FIXME: This heuristic may need to be expanded to other ways a block can be wider or narrower 283 // FIXME: This heuristic may need to be expanded to other ways a block can be wider or narrower
284 // than its parent containing block. 284 // than its parent containing block.
285 return block->style() && block->style()->width().isSpecified(); 285 return block->style() && block->style()->width().isSpecified();
286 } 286 }
287 287
288 TextAutosizer::TextAutosizer(const Document* document) 288 TextAutosizer::TextAutosizer(const Document* document)
289 : m_document(document), 289 : m_document(document),
290 m_firstBlockToBeginLayout(nullptr) 290 m_firstBlockToBeginLayout(nullptr),
291 #if ENABLE(ASSERT) 291 #if ENABLE(ASSERT)
292 , 292 m_blocksThatHaveBegunLayout(),
293 m_blocksThatHaveBegunLayout()
294 #endif 293 #endif
295 ,
296 m_superclusters(), 294 m_superclusters(),
297 m_clusterStack(), 295 m_clusterStack(),
298 m_fingerprintMapper(), 296 m_fingerprintMapper(),
299 m_pageInfo(), 297 m_pageInfo(),
300 m_updatePageInfoDeferred(false) { 298 m_updatePageInfoDeferred(false) {
301 } 299 }
302 300
303 TextAutosizer::~TextAutosizer() {} 301 TextAutosizer::~TextAutosizer() {}
304 302
305 void TextAutosizer::record(const LayoutBlock* block) { 303 void TextAutosizer::record(const LayoutBlock* block) {
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1277 computedSize = specifiedSize; 1275 computedSize = specifiedSize;
1278 } 1276 }
1279 return computedSize; 1277 return computedSize;
1280 } 1278 }
1281 1279
1282 DEFINE_TRACE(TextAutosizer) { 1280 DEFINE_TRACE(TextAutosizer) {
1283 visitor->trace(m_document); 1281 visitor->trace(m_document);
1284 } 1282 }
1285 1283
1286 } // namespace blink 1284 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698