Source/core/rendering/RenderTextControl.h - Issue 620753006: Rendering API cleanup

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

Issue 620753006: Rendering API cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Address jchaffraix remarks Created 6 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

« Source/core/rendering/RenderMedia.h ('K') | « Source/core/rendering/RenderText.h ('k') | Source/core/rendering/RenderTextControl.cpp » ('j') | Source/core/rendering/RenderView.h » ('J')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.

3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)	3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)

4 *	4 *

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

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

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

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43 // innerEditorElement may outlive the render tree.	43 // innerEditorElement may outlive the render tree.

44 HTMLElement* innerEditorElement() const;	44 HTMLElement* innerEditorElement() const;

45	45

46 int scrollbarThickness() const;	46 int scrollbarThickness() const;

47 void adjustInnerEditorStyle(RenderStyle* textBlockStyle) const;	47 void adjustInnerEditorStyle(RenderStyle* textBlockStyle) const;

48	48

49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;	49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;

50	50

51 void hitInnerEditorElement(HitTestResult&, const LayoutPoint& pointInContain er, const LayoutPoint& accumulatedOffset);	51 void hitInnerEditorElement(HitTestResult&, const LayoutPoint& pointInContain er, const LayoutPoint& accumulatedOffset);

52	52

53 int textBlockLogicalWidth() const;
Julien - ping for review 2014/10/03 01:26:43 Nit: Would probably keep. Nit: Would probably keep.
54 int textBlockLogicalHeight() const;	53 int textBlockLogicalHeight() const;

55	54

56 float scaleEmToUnits(int x) const;	55 float scaleEmToUnits(int x) const;

57	56

58 static bool hasValidAvgCharWidth(AtomicString family);	57 static bool hasValidAvgCharWidth(AtomicString family);

59 virtual float getAvgCharWidth(AtomicString family);	58 virtual float getAvgCharWidth(AtomicString family);

60 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;	59 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;

61 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0;	60 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const = 0;

62	61

63 virtual void updateFromElement() OVERRIDE;	62 virtual void updateFromElement() OVERRIDE;

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);	102 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);

104 }	103 }

105 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); }	104 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); }

106 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); }	105 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return lastLineBoxBaseline(direction); }

107 };	106 };

108	107

109	108

110 } // namespace blink	109 } // namespace blink

111	110

112 #endif // RenderTextControl_h	111 #endif // RenderTextControl_h

OLD	NEW