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

Side by Side Diff: Source/core/rendering/RenderCombineText.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride; 45 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
46 virtual void setTextInternal(PassRefPtr<StringImpl>) override; 46 virtual void setTextInternal(PassRefPtr<StringImpl>) override;
47 void updateIsCombined(); 47 void updateIsCombined();
48 48
49 float m_combinedTextWidth; 49 float m_combinedTextWidth;
50 float m_scaleX; 50 float m_scaleX;
51 bool m_isCombined : 1; 51 bool m_isCombined : 1;
52 bool m_needsFontUpdate : 1; 52 bool m_needsFontUpdate : 1;
53 }; 53 };
54 54
55 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText()); 55 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
56 56
57 } // namespace blink 57 } // namespace blink
58 58
59 #endif // RenderCombineText_h 59 #endif // RenderCombineText_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderButton.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698