third_party/WebKit/WebCore/rendering/RenderTableCol.h - Issue 21165: Revert the merge. Mac build is mysteriously broken.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 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

OLD	NEW
1 /*	1 /*

2 * This file is part of the DOM implementation for KDE.	2 * This file is part of the DOM implementation for KDE.

3 *	3 *

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

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

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

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

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

9 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.	9 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.

10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)	10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44	44

45 virtual const char* renderName() const { return "RenderTableCol"; }	45 virtual const char* renderName() const { return "RenderTableCol"; }

46 virtual bool isTableCol() const { return true; }	46 virtual bool isTableCol() const { return true; }

47 virtual int lineHeight(bool) const { return 0; }	47 virtual int lineHeight(bool) const { return 0; }

48 virtual void updateFromElement();	48 virtual void updateFromElement();

49	49

50 virtual bool isChildAllowed(RenderObject, RenderStyle) const;	50 virtual bool isChildAllowed(RenderObject, RenderStyle) const;

51 virtual bool canHaveChildren() const;	51 virtual bool canHaveChildren() const;

52 virtual bool requiresLayer() const { return false; }	52 virtual bool requiresLayer() const { return false; }

53	53

54 virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintC ontainer);	54 virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer);

55 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);	55 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);

56	56

57 int span() const { return m_span; }	57 int span() const { return m_span; }

58 void setSpan(int s) { m_span = s; }	58 void setSpan(int s) { m_span = s; }

59	59

60 private:	60 private:

61 RenderObjectChildList m_children;	61 RenderObjectChildList m_children;

62 int m_span;	62 int m_span;

63 };	63 };

64	64

65 }	65 }

66	66

67 #endif	67 #endif

OLD	NEW