Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Side by Side Diff: Source/core/html/HTMLOptionElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 return m_style; 295 return m_style;
296 } 296 }
297 297
298 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change) 298 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change)
299 { 299 {
300 if (change == NoChange) 300 if (change == NoChange)
301 return; 301 return;
302 302
303 // FIXME: We ask our owner select to repaint regardless of which property ch anged. 303 // FIXME: We ask our owner select to repaint regardless of which property ch anged.
304 if (HTMLSelectElement* select = ownerSelectElement()) { 304 if (HTMLSelectElement* select = ownerSelectElement()) {
305 if (RenderObject* renderer = select->renderer()) 305 if (LayoutObject* renderer = select->renderer())
306 renderer->setShouldDoFullPaintInvalidation(); 306 renderer->setShouldDoFullPaintInvalidation();
307 } 307 }
308 } 308 }
309 309
310 String HTMLOptionElement::textIndentedToRespectGroupLabel() const 310 String HTMLOptionElement::textIndentedToRespectGroupLabel() const
311 { 311 {
312 ContainerNode* parent = parentNode(); 312 ContainerNode* parent = parentNode();
313 if (parent && isHTMLOptGroupElement(*parent)) 313 if (parent && isHTMLOptGroupElement(*parent))
314 return " " + text(); 314 return " " + text();
315 return text(); 315 return text();
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 ASSERT(parent); 401 ASSERT(parent);
402 if (isHTMLOptGroupElement(*parent)) { 402 if (isHTMLOptGroupElement(*parent)) {
403 RenderStyle* parentStyle = parent->renderStyle() ? parent->renderSty le() : parent->computedStyle(); 403 RenderStyle* parentStyle = parent->renderStyle() ? parent->renderSty le() : parent->computedStyle();
404 return !parentStyle || parentStyle->display() == NONE; 404 return !parentStyle || parentStyle->display() == NONE;
405 } 405 }
406 } 406 }
407 return m_style->display() == NONE; 407 return m_style->display() == NONE;
408 } 408 }
409 409
410 } // namespace blink 410 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698