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

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

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Comment 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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 FingerprintSourceData data; 710 FingerprintSourceData data;
711 if (const LayoutObject* parent = parentElementLayoutObject(layoutObject)) 711 if (const LayoutObject* parent = parentElementLayoutObject(layoutObject))
712 data.m_parentHash = getFingerprint(parent); 712 data.m_parentHash = getFingerprint(parent);
713 713
714 data.m_qualifiedNameHash = QualifiedNameHash::hash(toElement(node)->tagQName ()); 714 data.m_qualifiedNameHash = QualifiedNameHash::hash(toElement(node)->tagQName ());
715 715
716 if (const ComputedStyle* style = layoutObject->style()) { 716 if (const ComputedStyle* style = layoutObject->style()) {
717 data.m_packedStyleProperties = style->direction(); 717 data.m_packedStyleProperties = style->direction();
718 data.m_packedStyleProperties |= (style->position() << 1); 718 data.m_packedStyleProperties |= (style->position() << 1);
719 data.m_packedStyleProperties |= (static_cast<unsigned>(style->floating() ) << 4); 719 data.m_packedStyleProperties |= (static_cast<unsigned>(style->floating() ) << 4);
720 data.m_packedStyleProperties |= (style->display() << 6); 720 data.m_packedStyleProperties |= (static_cast<unsigned>(style->display()) << 6);
721 data.m_packedStyleProperties |= (style->width().type() << 11); 721 data.m_packedStyleProperties |= (style->width().type() << 11);
722 // packedStyleProperties effectively using 15 bits now. 722 // packedStyleProperties effectively using 15 bits now.
723 723
724 // consider for adding: writing mode, padding. 724 // consider for adding: writing mode, padding.
725 725
726 data.m_width = style->width().getFloatValue(); 726 data.m_width = style->width().getFloatValue();
727 } 727 }
728 728
729 // Use nodeIndex as a rough approximation of column number 729 // Use nodeIndex as a rough approximation of column number
730 // (it's too early to call LayoutTableCell::col). 730 // (it's too early to call LayoutTableCell::col).
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 } 1224 }
1225 return computedSize; 1225 return computedSize;
1226 } 1226 }
1227 1227
1228 DEFINE_TRACE(TextAutosizer) 1228 DEFINE_TRACE(TextAutosizer)
1229 { 1229 {
1230 visitor->trace(m_document); 1230 visitor->trace(m_document);
1231 } 1231 }
1232 1232
1233 } // namespace blink 1233 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTheme.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineFlowBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698