| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
| 7 * Copyright (C) 2010 Google Inc. All rights reserved. | 7 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved. | 8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 return m_style; | 302 return m_style; |
| 303 } | 303 } |
| 304 | 304 |
| 305 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change) | 305 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change) |
| 306 { | 306 { |
| 307 if (change == NoChange) | 307 if (change == NoChange) |
| 308 return; | 308 return; |
| 309 | 309 |
| 310 // FIXME: We ask our owner select to repaint regardless of which property ch
anged. | 310 // FIXME: We ask our owner select to repaint regardless of which property ch
anged. |
| 311 if (HTMLSelectElement* select = ownerSelectElement()) { | 311 if (HTMLSelectElement* select = ownerSelectElement()) { |
| 312 if (RenderObject* renderer = select->renderer()) | 312 if (LayoutObject* renderer = select->renderer()) |
| 313 renderer->setShouldDoFullPaintInvalidation(); | 313 renderer->setShouldDoFullPaintInvalidation(); |
| 314 } | 314 } |
| 315 } | 315 } |
| 316 | 316 |
| 317 String HTMLOptionElement::textIndentedToRespectGroupLabel() const | 317 String HTMLOptionElement::textIndentedToRespectGroupLabel() const |
| 318 { | 318 { |
| 319 ContainerNode* parent = parentNode(); | 319 ContainerNode* parent = parentNode(); |
| 320 if (parent && isHTMLOptGroupElement(*parent)) | 320 if (parent && isHTMLOptGroupElement(*parent)) |
| 321 return " " + text(); | 321 return " " + text(); |
| 322 return text(); | 322 return text(); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 ASSERT(parent); | 408 ASSERT(parent); |
| 409 if (isHTMLOptGroupElement(*parent)) { | 409 if (isHTMLOptGroupElement(*parent)) { |
| 410 RenderStyle* parentStyle = parent->renderStyle() ? parent->renderSty
le() : parent->computedStyle(); | 410 RenderStyle* parentStyle = parent->renderStyle() ? parent->renderSty
le() : parent->computedStyle(); |
| 411 return !parentStyle || parentStyle->display() == NONE; | 411 return !parentStyle || parentStyle->display() == NONE; |
| 412 } | 412 } |
| 413 } | 413 } |
| 414 return m_style->display() == NONE; | 414 return m_style->display() == NONE; |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace blink | 417 } // namespace blink |
| OLD | NEW |