Source/WebCore/rendering/RenderRubyBase.h - Issue 8041046: Merge 95924 - Source/WebCore: Issues with merging block children of a ruby

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/RenderRubyBase.h

Issue 8041046: Merge 95924 - Source/WebCore: Issues with merging block children of a ruby (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/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-expected.txt ('k') | Source/WebCore/rendering/RenderRubyBase.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
45 virtual const char* renderName() const { return "RenderRubyBase (anonymous)" ; }	45 virtual const char* renderName() const { return "RenderRubyBase (anonymous)" ; }

46	46

47 virtual bool isRubyBase() const { return true; }	47 virtual bool isRubyBase() const { return true; }

48	48

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

50	50

51 private:	51 private:

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

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

54	54

55 bool hasOnlyWrappedInlineChildren(RenderObject* beforeChild = 0) const;

56

57 void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);	55 void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);

58 void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);	56 void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);

59 void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0 );	57 void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0 );

60 void mergeBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);

61	58

62 RenderRubyRun* rubyRun() const;	59 RenderRubyRun* rubyRun() const;

63	60

64 // Allow RenderRubyRun to manipulate the children within ruby bases.	61 // Allow RenderRubyRun to manipulate the children within ruby bases.

65 friend class RenderRubyRun;	62 friend class RenderRubyRun;

66 };	63 };

67	64

68 } // namespace WebCore	65 } // namespace WebCore

69	66

70 #endif // RenderRubyBase_h	67 #endif // RenderRubyBase_h

OLD	NEW