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

Side by Side Diff: Source/core/rendering/RenderInline.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
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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 765
766 LayoutUnit RenderInline::marginAfter(const RenderStyle* otherStyle) const 766 LayoutUnit RenderInline::marginAfter(const RenderStyle* otherStyle) const
767 { 767 {
768 return computeMargin(this, style()->marginAfterUsing(otherStyle ? otherStyle : style())); 768 return computeMargin(this, style()->marginAfterUsing(otherStyle ? otherStyle : style()));
769 } 769 }
770 770
771 const char* RenderInline::renderName() const 771 const char* RenderInline::renderName() const
772 { 772 {
773 if (isRelPositioned()) 773 if (isRelPositioned())
774 return "RenderInline (relative positioned)"; 774 return "RenderInline (relative positioned)";
775 // FIXME: Cleanup isPseudoElement duplication with other renderName methods.
776 // crbug.com/415653
777 if (style() && isPseudoElement()) {
778 if (style()->styleType() == BEFORE)
779 return "RenderInline (pseudo:before)";
780 if (style()->styleType() == AFTER)
781 return "RenderInline (pseudo:after)";
782 if (style()->styleType() == BACKDROP)
783 return "RenderInline (pseudo:backdrop)";
784 ASSERT_NOT_REACHED();
785 }
786 if (isAnonymous()) 775 if (isAnonymous())
787 return "RenderInline (generated)"; 776 return "RenderInline (generated)";
788 return "RenderInline"; 777 return "RenderInline";
789 } 778 }
790 779
791 bool RenderInline::nodeAtPoint(const HitTestRequest& request, HitTestResult& res ult, 780 bool RenderInline::nodeAtPoint(const HitTestRequest& request, HitTestResult& res ult,
792 const HitTestLocation& locationInContainer, cons t LayoutPoint& accumulatedOffset, HitTestAction hitTestAction) 781 const HitTestLocation& locationInContainer, cons t LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
793 { 782 {
794 return m_lineBoxes.hitTest(this, request, result, locationInContainer, accum ulatedOffset, hitTestAction); 783 return m_lineBoxes.hitTest(this, request, result, locationInContainer, accum ulatedOffset, hitTestAction);
795 } 784 }
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 container = this; 1410 container = this;
1422 1411
1423 FloatPoint absPos = container->localToAbsolute(); 1412 FloatPoint absPos = container->localToAbsolute();
1424 region.bounds.setX(absPos.x() + region.bounds.x()); 1413 region.bounds.setX(absPos.x() + region.bounds.x());
1425 region.bounds.setY(absPos.y() + region.bounds.y()); 1414 region.bounds.setY(absPos.y() + region.bounds.y());
1426 1415
1427 regions.append(region); 1416 regions.append(region);
1428 } 1417 }
1429 1418
1430 } // namespace blink 1419 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderDeprecatedFlexibleBox.cpp ('k') | Source/core/rendering/RenderTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698