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

Side by Side Diff: Source/core/editing/iterators/TextIterator.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/VisibleUnits.cpp ('k') | Source/core/frame/FrameView.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
3 * Copyright (C) 2005 Alexey Proskuryakov. 3 * Copyright (C) 2005 Alexey Proskuryakov.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 797
798 // NOTE: We only do this for a select set of nodes, and fwiw WinIE appears 798 // NOTE: We only do this for a select set of nodes, and fwiw WinIE appears
799 // not to do this at all 799 // not to do this at all
800 if (node->hasTagName(h1Tag) 800 if (node->hasTagName(h1Tag)
801 || node->hasTagName(h2Tag) 801 || node->hasTagName(h2Tag)
802 || node->hasTagName(h3Tag) 802 || node->hasTagName(h3Tag)
803 || node->hasTagName(h4Tag) 803 || node->hasTagName(h4Tag)
804 || node->hasTagName(h5Tag) 804 || node->hasTagName(h5Tag)
805 || node->hasTagName(h6Tag) 805 || node->hasTagName(h6Tag)
806 || node->hasTagName(pTag)) { 806 || node->hasTagName(pTag)) {
807 const LayoutStyle* style = r->style(); 807 const ComputedStyle* style = r->style();
808 if (style) { 808 if (style) {
809 int bottomMargin = toLayoutBox(r)->collapsedMarginAfter(); 809 int bottomMargin = toLayoutBox(r)->collapsedMarginAfter();
810 int fontSize = style->fontDescription().computedPixelSize(); 810 int fontSize = style->fontDescription().computedPixelSize();
811 if (bottomMargin * 2 >= fontSize) 811 if (bottomMargin * 2 >= fontSize)
812 return true; 812 return true;
813 } 813 }
814 } 814 }
815 815
816 return false; 816 return false;
817 } 817 }
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 return createPlainText(it); 1135 return createPlainText(it);
1136 } 1136 }
1137 1137
1138 String plainText(const Position& start, const Position& end, TextIteratorBehavio rFlags behavior) 1138 String plainText(const Position& start, const Position& end, TextIteratorBehavio rFlags behavior)
1139 { 1139 {
1140 TextIterator it(start, end, behavior); 1140 TextIterator it(start, end, behavior);
1141 return createPlainText(it); 1141 return createPlainText(it);
1142 } 1142 }
1143 1143
1144 } 1144 }
OLDNEW
« no previous file with comments | « Source/core/editing/VisibleUnits.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698