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

Side by Side Diff: Source/core/layout/LayoutTheme.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (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 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 Color LayoutTheme::platformInactiveListBoxSelectionForegroundColor() const 525 Color LayoutTheme::platformInactiveListBoxSelectionForegroundColor() const
526 { 526 {
527 return platformInactiveSelectionForegroundColor(); 527 return platformInactiveSelectionForegroundColor();
528 } 528 }
529 529
530 int LayoutTheme::baselinePosition(const LayoutObject* o) const 530 int LayoutTheme::baselinePosition(const LayoutObject* o) const
531 { 531 {
532 if (!o->isBox()) 532 if (!o->isBox())
533 return 0; 533 return 0;
534 534
535 const RenderBox* box = toRenderBox(o); 535 const LayoutBox* box = toLayoutBox(o);
536 536
537 #if USE(NEW_THEME) 537 #if USE(NEW_THEME)
538 return box->size().height() + box->marginTop() + m_platformTheme->baselinePo sitionAdjustment(o->style()->appearance()) * o->style()->effectiveZoom(); 538 return box->size().height() + box->marginTop() + m_platformTheme->baselinePo sitionAdjustment(o->style()->appearance()) * o->style()->effectiveZoom();
539 #else 539 #else
540 return box->size().height() + box->marginTop(); 540 return box->size().height() + box->marginTop();
541 #endif 541 #endif
542 } 542 }
543 543
544 bool LayoutTheme::isControlContainer(ControlPart appearance) const 544 bool LayoutTheme::isControlContainer(ControlPart appearance) const
545 { 545 {
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 1244
1245 // padding - not honored by WinIE, needs to be removed. 1245 // padding - not honored by WinIE, needs to be removed.
1246 style.resetPadding(); 1246 style.resetPadding();
1247 1247
1248 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 1248 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
1249 // for now, we will not honor it. 1249 // for now, we will not honor it.
1250 style.resetBorder(); 1250 style.resetBorder();
1251 } 1251 }
1252 1252
1253 } // namespace blink 1253 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTextControlSingleLine.cpp ('k') | Source/core/layout/LayoutThemeDefault.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698