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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 645623003: Remove hack to suppress pseudo element names. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 4170 matching lines...) Expand 10 before | Expand all | Expand 10 after
4181 return "RenderBlock (floating)"; 4181 return "RenderBlock (floating)";
4182 if (isOutOfFlowPositioned()) 4182 if (isOutOfFlowPositioned())
4183 return "RenderBlock (positioned)"; 4183 return "RenderBlock (positioned)";
4184 if (style()) { 4184 if (style()) {
4185 if (isAnonymousColumnsBlock()) 4185 if (isAnonymousColumnsBlock())
4186 return "RenderBlock (anonymous multi-column)"; 4186 return "RenderBlock (anonymous multi-column)";
4187 if (isAnonymousColumnSpanBlock()) 4187 if (isAnonymousColumnSpanBlock())
4188 return "RenderBlock (anonymous multi-column span)"; 4188 return "RenderBlock (anonymous multi-column span)";
4189 if (isAnonymousBlock()) 4189 if (isAnonymousBlock())
4190 return "RenderBlock (anonymous)"; 4190 return "RenderBlock (anonymous)";
4191 // FIXME: Cleanup isPseudoElement duplication with other renderName meth ods.
4192 // crbug.com/415653
4193 if (isPseudoElement()) {
4194 if (style()->styleType() == BEFORE)
4195 return "RenderBlock (pseudo:before)";
4196 if (style()->styleType() == AFTER)
4197 return "RenderBlock (pseudo:after)";
4198 if (style()->styleType() == BACKDROP)
4199 return "RenderBlock (pseudo:backdrop)";
4200 ASSERT_NOT_REACHED();
4201 }
4202 } 4191 }
4203 if (isAnonymous()) 4192 if (isAnonymous())
4204 return "RenderBlock (generated)"; 4193 return "RenderBlock (generated)";
4205 if (isRelPositioned()) 4194 if (isRelPositioned())
4206 return "RenderBlock (relative positioned)"; 4195 return "RenderBlock (relative positioned)";
4207 return "RenderBlock"; 4196 return "RenderBlock";
4208 } 4197 }
4209 4198
4210 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display) 4199 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display)
4211 { 4200 {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
4368 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4357 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4369 { 4358 {
4370 showRenderObject(); 4359 showRenderObject();
4371 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4360 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4372 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4361 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4373 } 4362 }
4374 4363
4375 #endif 4364 #endif
4376 4365
4377 } // namespace blink 4366 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698