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

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

Issue 709613003: To ensure consistency between layouts, we need to reset any overriden top for centering the textfie… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updates Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const override; 72 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, Layout Unit nonContentHeight) const override;
73 73
74 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final; 74 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final;
75 75
76 bool textShouldBeTruncated() const; 76 bool textShouldBeTruncated() const;
77 77
78 HTMLElement* innerSpinButtonElement() const; 78 HTMLElement* innerSpinButtonElement() const;
79 79
80 bool m_shouldDrawCapsLockIndicator; 80 bool m_shouldDrawCapsLockIndicator;
81 LayoutUnit m_desiredInnerEditorLogicalHeight; 81 LayoutUnit m_desiredInnerEditorLogicalHeight;
82 bool m_hasOverridenInnerEditorLogicalTop;
82 }; 83 };
83 84
84 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField()); 85 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTextControlSingleLine, isTextField());
85 86
86 // ---------------------------- 87 // ----------------------------
87 88
88 class RenderTextControlInnerBlock : public RenderBlockFlow { 89 class RenderTextControlInnerBlock : public RenderBlockFlow {
89 public: 90 public:
90 RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { } 91 RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { }
91 virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); } 92 virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return lastLineBoxBaseline(direction); }
92 93
93 private: 94 private:
94 virtual bool isIntristicallyScrollable(ScrollbarOrientation orientation) con st override 95 virtual bool isIntristicallyScrollable(ScrollbarOrientation orientation) con st override
95 { 96 {
96 return orientation == HorizontalScrollbar; 97 return orientation == HorizontalScrollbar;
97 } 98 }
98 virtual bool scrollsOverflowX() const override { return hasOverflowClip(); } 99 virtual bool scrollsOverflowX() const override { return hasOverflowClip(); }
99 virtual bool scrollsOverflowY() const override { return false; } 100 virtual bool scrollsOverflowY() const override { return false; }
100 virtual bool hasLineIfEmpty() const override { return true; } 101 virtual bool hasLineIfEmpty() const override { return true; }
101 }; 102 };
102 103
103 } 104 }
104 105
105 #endif 106 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698