Source/WebCore/rendering/RenderRubyText.h - Issue 8044031: Merge 94991 - <rdar://problem/10054615> Floats in ruby text intrude into the base

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: Source/WebCore/rendering/RenderRubyText.h

Issue 8044031: Merge 94991 - <rdar://problem/10054615> Floats in ruby text intrude into the base (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 2 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 | « LayoutTests/fast/ruby/float-overhang-from-ruby-text-expected.txt ('k') | Source/WebCore/rendering/RenderRubyText.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42	42

43 virtual const char* renderName() const { return "RenderRubyText"; }	43 virtual const char* renderName() const { return "RenderRubyText"; }

44	44

45 virtual bool isRubyText() const { return true; }	45 virtual bool isRubyText() const { return true; }

46	46

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

48	48

49 virtual void updateBeforeAfterContent(PseudoId);	49 virtual void updateBeforeAfterContent(PseudoId);

50	50

51 private:	51 private:

	52 virtual bool avoidsFloats() const;

	53

52 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;	54 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;

53 virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const;	55 virtual void adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const;

54 };	56 };

55	57

56 } // namespace WebCore	58 } // namespace WebCore

57	59

58 #endif // RenderRubyText_h	60 #endif // RenderRubyText_h

OLD	NEW