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

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

Issue 1106693002: Move the anonymous decoration to decoratedName. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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/LayoutInline.h ('k') | Source/core/layout/LayoutObject.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 * 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 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 LayoutUnit LayoutInline::marginBefore(const ComputedStyle* otherStyle) const 769 LayoutUnit LayoutInline::marginBefore(const ComputedStyle* otherStyle) const
770 { 770 {
771 return computeMargin(this, style()->marginBeforeUsing(otherStyle ? otherStyl e : style())); 771 return computeMargin(this, style()->marginBeforeUsing(otherStyle ? otherStyl e : style()));
772 } 772 }
773 773
774 LayoutUnit LayoutInline::marginAfter(const ComputedStyle* otherStyle) const 774 LayoutUnit LayoutInline::marginAfter(const ComputedStyle* otherStyle) const
775 { 775 {
776 return computeMargin(this, style()->marginAfterUsing(otherStyle ? otherStyle : style())); 776 return computeMargin(this, style()->marginAfterUsing(otherStyle ? otherStyle : style()));
777 } 777 }
778 778
779 const char* LayoutInline::name() const
780 {
781 if (isAnonymous())
782 return "LayoutInline (anonymous)";
783 return "LayoutInline";
784 }
785
786 bool LayoutInline::nodeAtPoint(HitTestResult& result, 779 bool LayoutInline::nodeAtPoint(HitTestResult& result,
787 const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOf fset, HitTestAction hitTestAction) 780 const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOf fset, HitTestAction hitTestAction)
788 { 781 {
789 return m_lineBoxes.hitTest(this, result, locationInContainer, accumulatedOff set, hitTestAction); 782 return m_lineBoxes.hitTest(this, result, locationInContainer, accumulatedOff set, hitTestAction);
790 } 783 }
791 784
792 namespace { 785 namespace {
793 786
794 class HitTestCulledInlinesGeneratorContext { 787 class HitTestCulledInlinesGeneratorContext {
795 public: 788 public:
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 } 1444 }
1452 1445
1453 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer) const 1446 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer) const
1454 { 1447 {
1455 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r); 1448 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r);
1456 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1449 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1457 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box); 1450 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
1458 } 1451 }
1459 1452
1460 } // namespace blink 1453 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutInline.h ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698