| 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. | 3 * (C) 2008 Torch Mobile Inc. All rights reserved. |
| 4 * (http://www.torchmobile.com/) | 4 * (http://www.torchmobile.com/) |
| 5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 6 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 6 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 // TODO(tkent): This should be done during layout. | 326 // TODO(tkent): This should be done during layout. |
| 327 if (logical_height.IsPercentOrCalc() || | 327 if (logical_height.IsPercentOrCalc() || |
| 328 (logical_height.IsFixed() && | 328 (logical_height.IsFixed() && |
| 329 logical_height.GetFloatValue() > computed_line_height)) | 329 logical_height.GetFloatValue() > computed_line_height)) |
| 330 text_block_style->SetLineHeight(ComputedStyle::InitialLineHeight()); | 330 text_block_style->SetLineHeight(ComputedStyle::InitialLineHeight()); |
| 331 | 331 |
| 332 text_block_style->SetDisplay(EDisplay::kBlock); | 332 text_block_style->SetDisplay(EDisplay::kBlock); |
| 333 text_block_style->SetUnique(); | 333 text_block_style->SetUnique(); |
| 334 | 334 |
| 335 if (InputElement()->ShouldRevealPassword()) | 335 if (InputElement()->ShouldRevealPassword()) |
| 336 text_block_style->SetTextSecurity(TSNONE); | 336 text_block_style->SetTextSecurity(ETextSecurity::kNone); |
| 337 | 337 |
| 338 text_block_style->SetOverflowX(EOverflow::kScroll); | 338 text_block_style->SetOverflowX(EOverflow::kScroll); |
| 339 // overflow-y:visible doesn't work because overflow-x:scroll makes a layer. | 339 // overflow-y:visible doesn't work because overflow-x:scroll makes a layer. |
| 340 text_block_style->SetOverflowY(EOverflow::kScroll); | 340 text_block_style->SetOverflowY(EOverflow::kScroll); |
| 341 RefPtr<ComputedStyle> no_scrollbar_style = ComputedStyle::Create(); | 341 RefPtr<ComputedStyle> no_scrollbar_style = ComputedStyle::Create(); |
| 342 no_scrollbar_style->SetStyleType(kPseudoIdScrollbar); | 342 no_scrollbar_style->SetStyleType(kPseudoIdScrollbar); |
| 343 no_scrollbar_style->SetDisplay(EDisplay::kNone); | 343 no_scrollbar_style->SetDisplay(EDisplay::kNone); |
| 344 text_block_style->AddCachedPseudoStyle(no_scrollbar_style); | 344 text_block_style->AddCachedPseudoStyle(no_scrollbar_style); |
| 345 text_block_style->SetHasPseudoStyle(kPseudoIdScrollbar); | 345 text_block_style->SetHasPseudoStyle(kPseudoIdScrollbar); |
| 346 | 346 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 // If the INPUT content height is smaller than the font height, the | 408 // If the INPUT content height is smaller than the font height, the |
| 409 // inner-editor element overflows the INPUT box intentionally, however it | 409 // inner-editor element overflows the INPUT box intentionally, however it |
| 410 // shouldn't affect outside of the INPUT box. So we ignore child overflow. | 410 // shouldn't affect outside of the INPUT box. So we ignore child overflow. |
| 411 } | 411 } |
| 412 | 412 |
| 413 HTMLInputElement* LayoutTextControlSingleLine::InputElement() const { | 413 HTMLInputElement* LayoutTextControlSingleLine::InputElement() const { |
| 414 return toHTMLInputElement(GetNode()); | 414 return toHTMLInputElement(GetNode()); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace blink | 417 } // namespace blink |
| OLD | NEW |