| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 // Do not allow line-height to be smaller than our default. | 276 // Do not allow line-height to be smaller than our default. |
| 277 if (textBlockStyle->fontSize() >= lineHeight(true, HorizontalLine, PositionO
fInteriorLineBoxes) || !startStyle.logicalHeight().isIntrinsicOrAuto()) | 277 if (textBlockStyle->fontSize() >= lineHeight(true, HorizontalLine, PositionO
fInteriorLineBoxes) || !startStyle.logicalHeight().isIntrinsicOrAuto()) |
| 278 textBlockStyle->setLineHeight(ComputedStyle::initialLineHeight()); | 278 textBlockStyle->setLineHeight(ComputedStyle::initialLineHeight()); |
| 279 | 279 |
| 280 textBlockStyle->setDisplay(BLOCK); | 280 textBlockStyle->setDisplay(BLOCK); |
| 281 textBlockStyle->setUnique(); | 281 textBlockStyle->setUnique(); |
| 282 | 282 |
| 283 if (inputElement()->shouldRevealPassword()) | 283 if (inputElement()->shouldRevealPassword()) |
| 284 textBlockStyle->setTextSecurity(TSNONE); | 284 textBlockStyle->setTextSecurity(TSNONE); |
| 285 | 285 |
| 286 textBlockStyle->setOverflowX(OSCROLL); | 286 textBlockStyle->setOverflowX(OverflowScroll); |
| 287 textBlockStyle->setOverflowY(OSCROLL); | 287 textBlockStyle->setOverflowY(OverflowScroll); |
| 288 RefPtr<ComputedStyle> noScrollbarStyle = ComputedStyle::create(); | 288 RefPtr<ComputedStyle> noScrollbarStyle = ComputedStyle::create(); |
| 289 noScrollbarStyle->setStyleType(SCROLLBAR); | 289 noScrollbarStyle->setStyleType(SCROLLBAR); |
| 290 noScrollbarStyle->setDisplay(NONE); | 290 noScrollbarStyle->setDisplay(NONE); |
| 291 textBlockStyle->addCachedPseudoStyle(noScrollbarStyle); | 291 textBlockStyle->addCachedPseudoStyle(noScrollbarStyle); |
| 292 textBlockStyle->setHasPseudoStyle(SCROLLBAR); | 292 textBlockStyle->setHasPseudoStyle(SCROLLBAR); |
| 293 | 293 |
| 294 return textBlockStyle.release(); | 294 return textBlockStyle.release(); |
| 295 } | 295 } |
| 296 | 296 |
| 297 bool LayoutTextControlSingleLine::textShouldBeTruncated() const | 297 bool LayoutTextControlSingleLine::textShouldBeTruncated() const |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 // inner-editor element overflows the INPUT box intentionally, however it | 362 // inner-editor element overflows the INPUT box intentionally, however it |
| 363 // shouldn't affect outside of the INPUT box. So we ignore child overflow. | 363 // shouldn't affect outside of the INPUT box. So we ignore child overflow. |
| 364 } | 364 } |
| 365 | 365 |
| 366 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const | 366 HTMLInputElement* LayoutTextControlSingleLine::inputElement() const |
| 367 { | 367 { |
| 368 return toHTMLInputElement(node()); | 368 return toHTMLInputElement(node()); |
| 369 } | 369 } |
| 370 | 370 |
| 371 } // namespace blink | 371 } // namespace blink |
| OLD | NEW |