Source/core/rendering/RenderTable.h - Issue 351213002: Change RenderObject::style(bool) to accept an enum instead

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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

« no previous file with comments | « Source/core/rendering/RenderSlider.cpp ('k') | Source/core/rendering/RenderTable.cpp » ('j') | no next file with comments »

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, 2009, 2010 Apple Inc. All rights reserv ed.	7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserv ed.

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 270 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
281	281

282 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;	282 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;

283 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;	283 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;

284 virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) OV ERRIDE;	284 virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) OV ERRIDE;

285 virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE;	285 virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE;

286 virtual void layout() OVERRIDE;	286 virtual void layout() OVERRIDE;

287 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE;	287 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE;

288 virtual void computePreferredLogicalWidths() OVERRIDE;	288 virtual void computePreferredLogicalWidths() OVERRIDE;

289 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;	289 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;

290	290

291 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE;	291 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;

292 virtual int firstLineBoxBaseline() const OVERRIDE;	292 virtual int firstLineBoxBaseline() const OVERRIDE;

293 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;	293 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;

294	294

295 RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;	295 RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;

296	296

297 void updateColumnCache() const;	297 void updateColumnCache() const;

298 void invalidateCachedColumns();	298 void invalidateCachedColumns();

299	299

300 virtual RenderBlock* firstLineBlock() const OVERRIDE;	300 virtual RenderBlock* firstLineBlock() const OVERRIDE;

301 virtual void updateFirstLetter() OVERRIDE;	301 virtual void updateFirstLetter() OVERRIDE;

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
361 if (m_firstBody)	361 if (m_firstBody)

362 return m_firstBody;	362 return m_firstBody;

363 return m_foot;	363 return m_foot;

364 }	364 }

365	365

366 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTable, isTable());	366 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTable, isTable());

367	367

368 } // namespace WebCore	368 } // namespace WebCore

369	369

370 #endif // RenderTable_h	370 #endif // RenderTable_h

OLD	NEW