| OLD | NEW |
| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 LayoutUnit preferredContentLogicalWidth(float charWidth) const final; | 71 LayoutUnit preferredContentLogicalWidth(float charWidth) const final; |
| 72 LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit non
ContentHeight) const override; | 72 LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit non
ContentHeight) const override; |
| 73 | 73 |
| 74 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) final; | 74 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) 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; | |
| 82 }; | 81 }; |
| 83 | 82 |
| 84 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextControlSingleLine, isTextField()); | 83 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextControlSingleLine, isTextField()); |
| 85 | 84 |
| 86 // ---------------------------- | 85 // ---------------------------- |
| 87 | 86 |
| 88 class LayoutTextControlInnerBlock : public LayoutBlockFlow { | 87 class LayoutTextControlInnerBlock : public LayoutBlockFlow { |
| 89 public: | 88 public: |
| 90 LayoutTextControlInnerBlock(Element* element) : LayoutBlockFlow(element) { } | 89 LayoutTextControlInnerBlock(Element* element) : LayoutBlockFlow(element) { } |
| 91 bool shouldIgnoreOverflowPropertyForInlineBlockBaseline() const override { r
eturn true; } | 90 bool shouldIgnoreOverflowPropertyForInlineBlockBaseline() const override { r
eturn true; } |
| 92 | 91 |
| 93 private: | 92 private: |
| 94 bool isIntrinsicallyScrollable(ScrollbarOrientation orientation) const overr
ide | 93 bool isIntrinsicallyScrollable(ScrollbarOrientation orientation) const overr
ide |
| 95 { | 94 { |
| 96 return orientation == HorizontalScrollbar; | 95 return orientation == HorizontalScrollbar; |
| 97 } | 96 } |
| 98 bool scrollsOverflowX() const override { return hasOverflowClip(); } | 97 bool scrollsOverflowX() const override { return hasOverflowClip(); } |
| 99 bool scrollsOverflowY() const override { return false; } | 98 bool scrollsOverflowY() const override { return false; } |
| 100 bool hasLineIfEmpty() const override { return true; } | 99 bool hasLineIfEmpty() const override { return true; } |
| 101 }; | 100 }; |
| 102 | 101 |
| 103 } | 102 } |
| 104 | 103 |
| 105 #endif | 104 #endif |
| OLD | NEW |