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

Side by Side Diff: Source/core/layout/LayoutMeter.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
« no previous file with comments | « Source/core/layout/LayoutMedia.cpp ('k') | Source/core/layout/LayoutMultiColumnFlowThread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 if (isHTMLMeterElement(*node())) 45 if (isHTMLMeterElement(*node()))
46 return toHTMLMeterElement(node()); 46 return toHTMLMeterElement(node());
47 47
48 ASSERT(node()->shadowHost()); 48 ASSERT(node()->shadowHost());
49 return toHTMLMeterElement(node()->shadowHost()); 49 return toHTMLMeterElement(node()->shadowHost());
50 } 50 }
51 51
52 void LayoutMeter::updateLogicalWidth() 52 void LayoutMeter::updateLogicalWidth()
53 { 53 {
54 RenderBox::updateLogicalWidth(); 54 LayoutBox::updateLogicalWidth();
55 55
56 IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(this, pixelSnapp edIntRect(frameRect())); 56 IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(this, pixelSnapp edIntRect(frameRect()));
57 setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.he ight()); 57 setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.he ight());
58 } 58 }
59 59
60 void LayoutMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logi calTop, LogicalExtentComputedValues& computedValues) const 60 void LayoutMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logi calTop, LogicalExtentComputedValues& computedValues) const
61 { 61 {
62 RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues); 62 LayoutBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
63 63
64 LayoutRect frame = frameRect(); 64 LayoutRect frame = frameRect();
65 if (isHorizontalWritingMode()) 65 if (isHorizontalWritingMode())
66 frame.setHeight(computedValues.m_extent); 66 frame.setHeight(computedValues.m_extent);
67 else 67 else
68 frame.setWidth(computedValues.m_extent); 68 frame.setWidth(computedValues.m_extent);
69 IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(this, pixelSnapp edIntRect(frame)); 69 IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(this, pixelSnapp edIntRect(frame));
70 computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : f rameSize.width(); 70 computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : f rameSize.width();
71 } 71 }
72 72
73 void LayoutMeter::updateFromElement() 73 void LayoutMeter::updateFromElement()
74 { 74 {
75 setShouldDoFullPaintInvalidation(); 75 setShouldDoFullPaintInvalidation();
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutMedia.cpp ('k') | Source/core/layout/LayoutMultiColumnFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698