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

Side by Side Diff: Source/core/layout/LayoutTreeAsText.cpp

Issue 944923004: rendering/RenderBoxModelObject -> layout/LayoutBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/layout/LayoutObject.cpp ('k') | Source/core/layout/line/InlineBox.h » ('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, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 && textStrokeColor != color && textStrokeColor.rgb()) 245 && textStrokeColor != color && textStrokeColor.rgb())
246 ts << " [textStrokeColor=" << textStrokeColor << "]"; 246 ts << " [textStrokeColor=" << textStrokeColor << "]";
247 247
248 if (o.parent()->style()->textStrokeWidth() != o.style()->textStrokeW idth() && o.style()->textStrokeWidth() > 0) 248 if (o.parent()->style()->textStrokeWidth() != o.style()->textStrokeW idth() && o.style()->textStrokeWidth() > 0)
249 ts << " [textStrokeWidth=" << o.style()->textStrokeWidth() << "] "; 249 ts << " [textStrokeWidth=" << o.style()->textStrokeWidth() << "] ";
250 } 250 }
251 251
252 if (!o.isBoxModelObject()) 252 if (!o.isBoxModelObject())
253 return; 253 return;
254 254
255 const RenderBoxModelObject& box = toRenderBoxModelObject(o); 255 const LayoutBoxModelObject& box = toLayoutBoxModelObject(o);
256 if (box.borderTop() || box.borderRight() || box.borderBottom() || box.bo rderLeft()) { 256 if (box.borderTop() || box.borderRight() || box.borderBottom() || box.bo rderLeft()) {
257 ts << " [border:"; 257 ts << " [border:";
258 258
259 BorderValue prevBorder = o.style()->borderTop(); 259 BorderValue prevBorder = o.style()->borderTop();
260 if (!box.borderTop()) { 260 if (!box.borderTop()) {
261 ts << " none"; 261 ts << " none";
262 } else { 262 } else {
263 ts << " (" << box.borderTop() << "px "; 263 ts << " (" << box.borderTop() << "px ";
264 printBorderStyle(ts, o.style()->borderTopStyle()); 264 printBorderStyle(ts, o.style()->borderTopStyle());
265 ts << o.resolveColor(CSSPropertyBorderTopColor) << ")"; 265 ts << o.resolveColor(CSSPropertyBorderTopColor) << ")";
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 element->document().updateLayout(); 780 element->document().updateLayout();
781 781
782 LayoutObject* renderer = element->renderer(); 782 LayoutObject* renderer = element->renderer();
783 if (!renderer || !renderer->isListItem()) 783 if (!renderer || !renderer->isListItem())
784 return String(); 784 return String();
785 785
786 return toRenderListItem(renderer)->markerText(); 786 return toRenderListItem(renderer)->markerText();
787 } 787 }
788 788
789 } // namespace blink 789 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698