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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 layoutView->viewWidth(IncludeScrollbars)); 572 layoutView->viewWidth(IncludeScrollbars));
573 adjustedLayoutBoundsWithScrollbars.setHeight( 573 adjustedLayoutBoundsWithScrollbars.setHeight(
574 layoutView->viewHeight(IncludeScrollbars)); 574 layoutView->viewHeight(IncludeScrollbars));
575 } 575 }
576 576
577 if (markedLayer) 577 if (markedLayer)
578 ts << (markedLayer == &layer ? "*" : " "); 578 ts << (markedLayer == &layer ? "*" : " ");
579 579
580 writeIndent(ts, indent); 580 writeIndent(ts, indent);
581 581
582 if (layer.layoutObject()->style()->visibility() == EVisibility::Hidden) 582 if (layer.layoutObject()->style()->visibility() == EVisibility::kHidden)
583 ts << "hidden "; 583 ts << "hidden ";
584 584
585 ts << "layer "; 585 ts << "layer ";
586 586
587 if (behavior & LayoutAsTextShowAddresses) 587 if (behavior & LayoutAsTextShowAddresses)
588 ts << static_cast<const void*>(&layer) << " "; 588 ts << static_cast<const void*>(&layer) << " ";
589 589
590 ts << adjustedLayoutBoundsWithScrollbars; 590 ts << adjustedLayoutBoundsWithScrollbars;
591 591
592 if (!adjustedLayoutBounds.isEmpty()) { 592 if (!adjustedLayoutBounds.isEmpty()) {
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 element->document().updateStyleAndLayout(); 883 element->document().updateStyleAndLayout();
884 884
885 LayoutObject* layoutObject = element->layoutObject(); 885 LayoutObject* layoutObject = element->layoutObject();
886 if (!layoutObject || !layoutObject->isListItem()) 886 if (!layoutObject || !layoutObject->isListItem())
887 return String(); 887 return String();
888 888
889 return toLayoutListItem(layoutObject)->markerText(); 889 return toLayoutListItem(layoutObject)->markerText();
890 } 890 }
891 891
892 } // namespace blink 892 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMac.mm ('k') | third_party/WebKit/Source/core/layout/ListMarkerText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698