Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 2 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
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 24 matching lines...) Expand all
35 35
36 private: 36 private:
37 virtual bool isTextArea() const OVERRIDE { return true; } 37 virtual bool isTextArea() const OVERRIDE { return true; }
38 38
39 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 39 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;
40 40
41 virtual float getAvgCharWidth(AtomicString family) OVERRIDE; 41 virtual float getAvgCharWidth(AtomicString family) OVERRIDE;
42 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERR IDE; 42 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERR IDE;
43 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const OVERRIDE; 43 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const OVERRIDE;
44 // We override the two baseline functions because we want our baseline to be the bottom of our margin box. 44 // We override the two baseline functions because we want our baseline to be the bottom of our margin box.
45 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 45 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
46 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE { return - 1; } 46 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE { return - 1; }
47 47
48 virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* st artStyle) const OVERRIDE; 48 virtual PassRefPtr<RenderStyle> createInnerEditorStyle(const RenderStyle* st artStyle) const OVERRIDE;
49 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE; 49 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE;
50 }; 50 };
51 51
52 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlMultiLine, isTextArea()); 52 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlMultiLine, isTextArea());
53 53
54 } 54 }
55 55
56 #endif 56 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextControl.cpp ('k') | Source/core/rendering/RenderTextControlMultiLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698