OLD | NEW |
1 /** | 1 /** |
2 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2010 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 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 | 339 |
340 textBlockStyle->setWhiteSpace(PRE); | 340 textBlockStyle->setWhiteSpace(PRE); |
341 textBlockStyle->setOverflowWrap(NormalOverflowWrap); | 341 textBlockStyle->setOverflowWrap(NormalOverflowWrap); |
342 textBlockStyle->setOverflowX(OHIDDEN); | 342 textBlockStyle->setOverflowX(OHIDDEN); |
343 textBlockStyle->setOverflowY(OHIDDEN); | 343 textBlockStyle->setOverflowY(OHIDDEN); |
344 textBlockStyle->setTextOverflow(textShouldBeTruncated() ? TextOverflowEllips
is : TextOverflowClip); | 344 textBlockStyle->setTextOverflow(textShouldBeTruncated() ? TextOverflowEllips
is : TextOverflowClip); |
345 | 345 |
346 if (m_desiredInnerEditorLogicalHeight >= 0) | 346 if (m_desiredInnerEditorLogicalHeight >= 0) |
347 textBlockStyle->setLogicalHeight(Length(m_desiredInnerEditorLogicalHeigh
t, Fixed)); | 347 textBlockStyle->setLogicalHeight(Length(m_desiredInnerEditorLogicalHeigh
t, Fixed)); |
348 // Do not allow line-height to be smaller than our default. | 348 // Do not allow line-height to be smaller than our default. |
349 if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, Horizonta
lLine, PositionOfInteriorLineBoxes)) | 349 if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(FirstLineStyle,
HorizontalLine, PositionOfInteriorLineBoxes)) |
350 textBlockStyle->setLineHeight(RenderStyle::initialLineHeight()); | 350 textBlockStyle->setLineHeight(RenderStyle::initialLineHeight()); |
351 | 351 |
352 textBlockStyle->setDisplay(BLOCK); | 352 textBlockStyle->setDisplay(BLOCK); |
353 textBlockStyle->setUnique(); | 353 textBlockStyle->setUnique(); |
354 | 354 |
355 if (inputElement()->shouldRevealPassword()) | 355 if (inputElement()->shouldRevealPassword()) |
356 textBlockStyle->setTextSecurity(TSNONE); | 356 textBlockStyle->setTextSecurity(TSNONE); |
357 | 357 |
358 return textBlockStyle.release(); | 358 return textBlockStyle.release(); |
359 } | 359 } |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 if (innerEditorElement()) | 411 if (innerEditorElement()) |
412 innerEditorElement()->setScrollTop(newTop); | 412 innerEditorElement()->setScrollTop(newTop); |
413 } | 413 } |
414 | 414 |
415 HTMLInputElement* RenderTextControlSingleLine::inputElement() const | 415 HTMLInputElement* RenderTextControlSingleLine::inputElement() const |
416 { | 416 { |
417 return toHTMLInputElement(node()); | 417 return toHTMLInputElement(node()); |
418 } | 418 } |
419 | 419 |
420 } | 420 } |
OLD | NEW |