| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 int tickLength = LayoutTheme::theme().sliderTickSize().height(); | 77 int tickLength = LayoutTheme::theme().sliderTickSize().height(); |
| 78 trackHeight = 2 * (offsetFromCenter + tickLength); | 78 trackHeight = 2 * (offsetFromCenter + tickLength); |
| 79 } | 79 } |
| 80 float zoomFactor = style()->effectiveZoom(); | 80 float zoomFactor = style()->effectiveZoom(); |
| 81 if (zoomFactor != 1.0) | 81 if (zoomFactor != 1.0) |
| 82 trackHeight *= zoomFactor; | 82 trackHeight *= zoomFactor; |
| 83 | 83 |
| 84 // FIXME: The trackHeight should have been added before updateLogicalHei
ght was called to avoid this hack. | 84 // FIXME: The trackHeight should have been added before updateLogicalHei
ght was called to avoid this hack. |
| 85 setIntrinsicContentLogicalHeight(trackHeight); | 85 setIntrinsicContentLogicalHeight(trackHeight); |
| 86 | 86 |
| 87 RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues)
; | 87 LayoutBox::computeLogicalHeight(trackHeight, logicalTop, computedValues)
; |
| 88 return; | 88 return; |
| 89 } | 89 } |
| 90 if (isVertical) | 90 if (isVertical) |
| 91 logicalHeight = LayoutSlider::defaultTrackLength; | 91 logicalHeight = LayoutSlider::defaultTrackLength; |
| 92 | 92 |
| 93 // FIXME: The trackHeight should have been added before updateLogicalHeight
was called to avoid this hack. | 93 // FIXME: The trackHeight should have been added before updateLogicalHeight
was called to avoid this hack. |
| 94 setIntrinsicContentLogicalHeight(logicalHeight); | 94 setIntrinsicContentLogicalHeight(logicalHeight); |
| 95 | 95 |
| 96 RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues); | 96 LayoutBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues); |
| 97 } | 97 } |
| 98 | 98 |
| 99 void LayoutSliderContainer::layout() | 99 void LayoutSliderContainer::layout() |
| 100 { | 100 { |
| 101 HTMLInputElement* input = toHTMLInputElement(node()->shadowHost()); | 101 HTMLInputElement* input = toHTMLInputElement(node()->shadowHost()); |
| 102 bool isVertical = hasVerticalAppearance(input); | 102 bool isVertical = hasVerticalAppearance(input); |
| 103 style()->setFlexDirection(isVertical ? FlowColumn : FlowRow); | 103 style()->setFlexDirection(isVertical ? FlowColumn : FlowRow); |
| 104 TextDirection oldTextDirection = style()->direction(); | 104 TextDirection oldTextDirection = style()->direction(); |
| 105 if (isVertical) { | 105 if (isVertical) { |
| 106 // FIXME: Work around rounding issues in RTL vertical sliders. We want t
hem to | 106 // FIXME: Work around rounding issues in RTL vertical sliders. We want t
hem to |
| 107 // render identically to LTR vertical sliders. We can remove this work a
round when | 107 // render identically to LTR vertical sliders. We can remove this work a
round when |
| 108 // subpixel rendering is enabled on all ports. | 108 // subpixel rendering is enabled on all ports. |
| 109 style()->setDirection(LTR); | 109 style()->setDirection(LTR); |
| 110 } | 110 } |
| 111 | 111 |
| 112 Element* thumbElement = input->closedShadowRoot()->getElementById(ShadowElem
entNames::sliderThumb()); | 112 Element* thumbElement = input->closedShadowRoot()->getElementById(ShadowElem
entNames::sliderThumb()); |
| 113 Element* trackElement = input->closedShadowRoot()->getElementById(ShadowElem
entNames::sliderTrack()); | 113 Element* trackElement = input->closedShadowRoot()->getElementById(ShadowElem
entNames::sliderTrack()); |
| 114 RenderBox* thumb = thumbElement ? thumbElement->renderBox() : 0; | 114 LayoutBox* thumb = thumbElement ? thumbElement->layoutBox() : 0; |
| 115 RenderBox* track = trackElement ? trackElement->renderBox() : 0; | 115 LayoutBox* track = trackElement ? trackElement->layoutBox() : 0; |
| 116 | 116 |
| 117 SubtreeLayoutScope layoutScope(*this); | 117 SubtreeLayoutScope layoutScope(*this); |
| 118 // Force a layout to reset the position of the thumb so the code below doesn
't move the thumb to the wrong place. | 118 // Force a layout to reset the position of the thumb so the code below doesn
't move the thumb to the wrong place. |
| 119 // FIXME: Make a custom Render class for the track and move the thumb positi
oning code there. | 119 // FIXME: Make a custom Render class for the track and move the thumb positi
oning code there. |
| 120 if (track) | 120 if (track) |
| 121 layoutScope.setChildNeedsLayout(track); | 121 layoutScope.setChildNeedsLayout(track); |
| 122 | 122 |
| 123 RenderFlexibleBox::layout(); | 123 RenderFlexibleBox::layout(); |
| 124 | 124 |
| 125 style()->setDirection(oldTextDirection); | 125 style()->setDirection(oldTextDirection); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 140 thumbLocation.setX(thumbLocation.x() - offset); | 140 thumbLocation.setX(thumbLocation.x() - offset); |
| 141 thumb->setLocation(thumbLocation); | 141 thumb->setLocation(thumbLocation); |
| 142 | 142 |
| 143 // We need one-off invalidation code here because painting of the timeline e
lement does not go through style. | 143 // We need one-off invalidation code here because painting of the timeline e
lement does not go through style. |
| 144 // Instead it has a custom implementation in C++ code. | 144 // Instead it has a custom implementation in C++ code. |
| 145 // Therefore the style system cannot understand when it needs to be paint in
validated. | 145 // Therefore the style system cannot understand when it needs to be paint in
validated. |
| 146 setShouldDoFullPaintInvalidation(); | 146 setShouldDoFullPaintInvalidation(); |
| 147 } | 147 } |
| 148 | 148 |
| 149 } // namespace blink | 149 } // namespace blink |
| OLD | NEW |