third_party/WebKit/WebCore/rendering/RenderTableCell.h - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderTableCell.h

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)	2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)

3 * (C) 1997 Torben Weis (weis@kde.org)	3 * (C) 1997 Torben Weis (weis@kde.org)

4 * (C) 1998 Waldo Bastian (bastian@kde.org)	4 * (C) 1998 Waldo Bastian (bastian@kde.org)

5 * (C) 1999 Lars Knoll (knoll@kde.org)	5 * (C) 1999 Lars Knoll (knoll@kde.org)

6 * (C) 1999 Antti Koivisto (koivisto@kde.org)	6 * (C) 1999 Antti Koivisto (koivisto@kde.org)

7 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.	7 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.

8 *	8 *

9 * This library is free software; you can redistribute it and/or	9 * This library is free software; you can redistribute it and/or

10 * modify it under the terms of the GNU Library General Public	10 * modify it under the terms of the GNU Library General Public

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 void paintCollapsedBorder(GraphicsContext*, int x, int y, int w, int h);	96 void paintCollapsedBorder(GraphicsContext*, int x, int y, int w, int h);

97 void paintBackgroundsBehindCell(PaintInfo&, int tx, int ty, RenderObject* ba ckgroundObject);	97 void paintBackgroundsBehindCell(PaintInfo&, int tx, int ty, RenderObject* ba ckgroundObject);

98	98

99 // Lie about position to outside observers.	99 // Lie about position to outside observers.

100 virtual int yPos() const { return m_y + m_topExtra; }	100 virtual int yPos() const { return m_y + m_topExtra; }

101	101

102 virtual IntRect absoluteClippedOverflowRect();	102 virtual IntRect absoluteClippedOverflowRect();

103 virtual void computeAbsoluteRepaintRect(IntRect&, bool fixed = false);	103 virtual void computeAbsoluteRepaintRect(IntRect&, bool fixed = false);

104 virtual FloatPoint localToAbsolute(FloatPoint localPoint = FloatPoint(), boo l fixed = false, bool useTransforms = false) const;	104 virtual FloatPoint localToAbsolute(FloatPoint localPoint = FloatPoint(), boo l fixed = false, bool useTransforms = false) const;

105 virtual FloatPoint absoluteToLocal(FloatPoint containerPoint, bool fixed = f alse, bool useTransforms = false) const;	105 virtual FloatPoint absoluteToLocal(FloatPoint containerPoint, bool fixed = f alse, bool useTransforms = false) const;

	106 virtual FloatQuad localToAbsoluteQuad(const FloatQuad&, bool fixed = false) const;

106	107

107 virtual int baselinePosition(bool firstLine = false, bool isRootLineBox = fa lse) const;	108 virtual int baselinePosition(bool firstLine = false, bool isRootLineBox = fa lse) const;

108	109

109 void setCellTopExtra(int p) { m_topExtra = p; }	110 void setCellTopExtra(int p) { m_topExtra = p; }

110 void setCellBottomExtra(int p) { m_bottomExtra = p; }	111 void setCellBottomExtra(int p) { m_bottomExtra = p; }

111	112

112 virtual int borderTopExtra() const { return m_topExtra; }	113 virtual int borderTopExtra() const { return m_topExtra; }

113 virtual int borderBottomExtra() const { return m_bottomExtra; }	114 virtual int borderBottomExtra() const { return m_bottomExtra; }

114	115

115 protected:	116 protected:

116 virtual void styleWillChange(RenderStyle::Diff, const RenderStyle* newStyle) ;	117 virtual void styleWillChange(RenderStyle::Diff, const RenderStyle* newStyle) ;

117 virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);	118 virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);

118	119

119 private:	120 private:

120 int m_row;	121 int m_row;

121 int m_column;	122 int m_column;

122 int m_rowSpan;	123 int m_rowSpan;

123 int m_columnSpan;	124 int m_columnSpan;

124 int m_topExtra : 31;	125 int m_topExtra : 31;

125 int m_bottomExtra : 31;	126 int m_bottomExtra : 31;

126 bool m_widthChanged : 1;	127 bool m_widthChanged : 1;

127 int m_percentageHeight;	128 int m_percentageHeight;

128 };	129 };

129	130

130 } // namespace WebCore	131 } // namespace WebCore

131	132

132 #endif // RenderTableCell_h	133 #endif // RenderTableCell_h

OLD	NEW