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

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6
Patch Set: get-names-7: rebase Created 4 years, 9 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) 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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 402
403 if (needsLayout) 403 if (needsLayout)
404 ts << ")"; 404 ts << ")";
405 } 405 }
406 } 406 }
407 407
408 static void writeInlineBox(TextStream& ts, const InlineBox& box, int indent) 408 static void writeInlineBox(TextStream& ts, const InlineBox& box, int indent)
409 { 409 {
410 writeIndent(ts, indent); 410 writeIndent(ts, indent);
411 ts << "+ "; 411 ts << "+ ";
412 ts << box.boxName() << " {" << box.lineLayoutItem().debugName() << "}" 412 ts << box.boxName() << " {" << box.getLineLayoutItem().debugName() << "}"
413 << " pos=(" << box.x() << "," << box.y() << ")" 413 << " pos=(" << box.x() << "," << box.y() << ")"
414 << " size=(" << box.width() << "," << box.height() << ")" 414 << " size=(" << box.width() << "," << box.height() << ")"
415 << " baseline=" << box.baselinePosition(AlphabeticBaseline) 415 << " baseline=" << box.baselinePosition(AlphabeticBaseline)
416 << "/" << box.baselinePosition(IdeographicBaseline); 416 << "/" << box.baselinePosition(IdeographicBaseline);
417 } 417 }
418 418
419 static void writeInlineTextBox(TextStream& ts, const InlineTextBox& textBox, int indent) 419 static void writeInlineTextBox(TextStream& ts, const InlineTextBox& textBox, int indent)
420 { 420 {
421 writeInlineBox(ts, textBox, indent); 421 writeInlineBox(ts, textBox, indent);
422 String value = textBox.text(); 422 String value = textBox.text();
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 element->document().updateLayout(); 845 element->document().updateLayout();
846 846
847 LayoutObject* layoutObject = element->layoutObject(); 847 LayoutObject* layoutObject = element->layoutObject();
848 if (!layoutObject || !layoutObject->isListItem()) 848 if (!layoutObject || !layoutObject->isListItem())
849 return String(); 849 return String();
850 850
851 return toLayoutListItem(layoutObject)->markerText(); 851 return toLayoutListItem(layoutObject)->markerText();
852 } 852 }
853 853
854 } // namespace blink 854 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698