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

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/RenderInline.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

« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderContainer.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderInline.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of the render object implementation for KHTML.	2 * This file is part of the render object implementation for KHTML.

3 *	3 *

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

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

6 * Copyright (C) 2003 Apple Computer, Inc.	6 * Copyright (C) 2003 Apple Computer, Inc.

7 *	7 *

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

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

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 virtual int width() const;	62 virtual int width() const;

63 virtual int height() const;	63 virtual int height() const;

64	64

65 // used to calculate offsetWidth/Height. Overridden by inlines (RenderFlow) to return	65 // used to calculate offsetWidth/Height. Overridden by inlines (RenderFlow) to return

66 // the remaining width on a given line (and the height of a single line).	66 // the remaining width on a given line (and the height of a single line).

67 virtual int offsetLeft() const;	67 virtual int offsetLeft() const;

68 virtual int offsetTop() const;	68 virtual int offsetTop() const;

69	69

70 void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLevel = true);	70 void absoluteRects(Vector<IntRect>&, int tx, int ty, bool topLevel = true);

	71 virtual void absoluteQuads(Vector<FloatQuad>&, bool topLevel = true);

71	72

72 virtual VisiblePosition positionForCoordinates(int x, int y);	73 virtual VisiblePosition positionForCoordinates(int x, int y);

73	74

74 protected:	75 protected:

75 virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);	76 virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);

76	77

77 static RenderInline* cloneInline(RenderFlow* src);	78 static RenderInline* cloneInline(RenderFlow* src);

78	79

79 };	80 };

80	81

81 } // namespace WebCore	82 } // namespace WebCore

82	83

83 #endif // RenderInline_h	84 #endif // RenderInline_h

OLD	NEW